hocus_pocus 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: edecd980d715c253b5c537d514126d6b47c8464a
-  data.tar.gz: fd40e8fda64b5b518f428497484f422a3d082e76
+  metadata.gz: eca0d66944e5a36d17491259d52e0fd076578425
+  data.tar.gz: 9b6c14bd4bc5f261bfed810594ef31303267ec63
 SHA512:
-  metadata.gz: 565e4e6c0ae027437fad7b42457585d0f052bc992bbe08d9ef3fe8d7557805c372eef6c9814ab9a90d63bf9f00465afb001b7876932a347d308a57f204f7e246
-  data.tar.gz: 3e4ec870cb057bb87d3d5365b22baa4c00329032fe4b132b8bd03a0edd71f9932a6b1ff0c27994d460a4b89d999d79c83644d43b5dacece259611eeb40e5e4ea
+  metadata.gz: e05c8b8f5937608cae75370ea4ec7958e2e521d7b11b1e30a8517a3925c0f9704468ca7e4844f3af9dc8c09c4c89bf1d5498ddd0bbed6b6b2c91c57474492eed
+  data.tar.gz: f0116cac8f20e54c9f5df6fcb374b119d6a0744b99ca447fd9dd43e0575e6ed3b10df43fee75feb4f2b66803a0194169a0f149e08d0da4271b493bf3ebc57e90

data/engines/editor/app/assets/stylesheets/editor.css.sass

@@ -0,0 +1,68 @@
+$black: #444444
+$white: white
+$yellow: #fffe89
+$button_yellow: #fffe89
+$background-color: rgba(0, 0, 0, 0.6)
+$background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyRpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoTWFjaW50b3NoKSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDpFMzYyQzY2NkU4MTAxMUUyQURCNUY4ODI4NTdDOTEyQiIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDpFMzYyQzY2N0U4MTAxMUUyQURCNUY4ODI4NTdDOTEyQiI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkRDNEM3RDFERTgwRjExRTJBREI1Rjg4Mjg1N0M5MTJCIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOkRDNEM3RDFFRTgwRjExRTJBREI1Rjg4Mjg1N0M5MTJCIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+Uo8+OAAAACFJREFUeNpi+P//vzwQMxDCTAxEglGFeAELlJYnpBAgwADObh41Cq6M2wAAAABJRU5ErkJggg==)
+
+#__editor__
+  =button($button-color: $button_yellow)
+    display: block
+    color: lighten($black, 8%)
+    font-size: 18px
+    font-weight: bold
+    line-height: 18px
+    text-decoration: none
+    border-radius: 4px
+    text-shadow: rgba(255, 255, 255, 0.4) 0 1px 0
+    padding: 8px 20px
+    border: darken($button-color, 22%) solid 1px
+    box-shadow: rgba(255, 255, 255, 0.2) 0 1px 0 inset, rgba(0, 0, 0, 0.1) 0 1px 0
+    background: linear-gradient($button-color, darken($button-color, 18%))
+    cursor: pointer
+    &:hover
+      background: linear-gradient(darken($button-color, 6%), darken($button-color, 12%))
+    &:active
+      box-shadow: rgba(0, 0, 0, 0.1) 0 1px 1px inset, rgba(255, 255, 255, 0.1) 0 1px 0
+  padding: 30px 0
+  font-size: 16px
+  background: $background-color $background-image repeat top right
+  font-family: arial,sans-serif
+  color: $black
+  position: absolute
+  left: 0
+  top: 0
+  width: 100%
+  p, ul, ol, dl, p, li, dt, dd, tr, td, form, h1, h2
+    margin: 0
+    padding: 0
+
+  input
+    font-family: arial,sans-serif
+    border: none
+
+  h3
+    margin: 0 0 30px
+    text-align: center
+    font-size: 22px
+    color: $white
+
+  #file
+    display: block
+    margin: 0 auto 30px
+
+  #actions
+    clear: both
+    width: 200px
+    margin: 0 auto
+    overflow: hidden
+    .hide
+      +button(#f8f8f8)
+      float: left
+    .save
+      +button
+      float: right
+
+  #generate_submit
+    +button
+    margin: 0 auto

data/engines/editor/app/views/hocus_pocus/editor/editor/_editor.html.erb

@@ -1,14 +1,14 @@
 <div id="__editor__">
+  <link href="/assets/editor.css" media="all" rel="stylesheet" type="text/css">
   <h3>editing <%= @path %>...</h3>
 
   <%= form_tag save_editor_path, :remote => true, :id => HocusPocus::Editor::EDITOR do %>
     <%= hidden_field_tag :path, @path %>
     <%= text_area_tag :file, @file, :size => '100x30' %>
-    <div align="right">
-      <%= button_to_function 'Hide', "$('#__editor__').hide()" %>&nbsp;
-      <%= submit_tag 'Save!' %>
+    <div id="actions">
+      <%= button_to_function 'Hide', "$('#__editor__').hide()", :class => "hide" %>
+      <%= submit_tag 'Save!', :class => "save" %>
     </div>
   <% end %>
 
-  <hr>
 </div>

data/engines/editor/lib/hocus_pocus/editor/middleware.rb

@@ -13,7 +13,7 @@ module HocusPocus
         @app.call(env).tap do |status, headers, body|
           if body.is_a?(ActionDispatch::Response) && body.request.format.html?
             if Thread.current[HocusPocus::Editor::VIEW_FILENAME]
-              body.body = insert_text body.body, :after, /<div id="#{HocusPocus::CONTAINER}" .*?>/i, %Q[#{edit_link}<br>#{partials}]
+              body.body = insert_text body.body, :after, /<div id="#{HocusPocus::CONTAINER}" .*?>/i, %Q[#{edit_link}#{partials}]
               Thread.current[HocusPocus::Editor::VIEW_FILENAME] = nil
             end
           end
@@ -22,11 +22,11 @@ module HocusPocus
 
       private
       def edit_link
-        %Q[<a href="/hocus_pocus/editor?template=#{Thread.current[HocusPocus::Editor::VIEW_FILENAME]}" data-remote="true" onclick="$(this).closest('div').find('div.partials').toggle()">edit</a>]
+        %Q[<a href="/hocus_pocus/editor?template=#{Thread.current[HocusPocus::Editor::VIEW_FILENAME]}" data-remote="true" onclick="$(this).closest('div').find('div.partials').toggle()" class="edit">edit</a>]
       end
 
       def partials
-        %Q[<div class="partials" style="display:none">#{(Thread.current[HocusPocus::Editor::PARTIAL_FILENAMES] || []).map(&:virtual_path).map {|v| '<a href="/hocus_pocus/editor?template=' + v + '" data-remote="true">' + v + '</a>'}.join('<br>')}</div>]
+        %Q[<div class="partials" style="display:none">#{(Thread.current[HocusPocus::Editor::PARTIAL_FILENAMES] || []).map(&:virtual_path).map {|v| '<a href="/hocus_pocus/editor?template=' + v + '" data-remote="true" class="partials">' + v + '</a>'}.join('')}</div>]
       end
     end
   end

data/engines/generator/app/assets/stylesheets/generator.css.sass

@@ -0,0 +1,105 @@
+$black: #444444
+$white: white
+$yellow: #fffe89
+$button_yellow: #fffe89
+$background-color: rgba(0, 0, 0, 0.6)
+$background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyRpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoTWFjaW50b3NoKSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDpFMzYyQzY2NkU4MTAxMUUyQURCNUY4ODI4NTdDOTEyQiIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDpFMzYyQzY2N0U4MTAxMUUyQURCNUY4ODI4NTdDOTEyQiI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkRDNEM3RDFERTgwRjExRTJBREI1Rjg4Mjg1N0M5MTJCIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOkRDNEM3RDFFRTgwRjExRTJBREI1Rjg4Mjg1N0M5MTJCIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+Uo8+OAAAACFJREFUeNpi+P//vzwQMxDCTAxEglGFeAELlJYnpBAgwADObh41Cq6M2wAAAABJRU5ErkJggg==)
+
+// reset
+
+html, body, p, ul, ol, dl, p, li, dt, dd, tr, td, form, h1, h2
+  margin: 0
+  padding: 0
+
+body
+  padding: 20px
+  font-size: 16px
+  background: $background-color $background-image repeat top right
+  font-family: arial,sans-serif
+  color: $black
+
+input
+  font-family: arial,sans-serif
+
+h1
+  margin: 0 0 30px
+  text-align: center
+  font-size: 26px
+
+#container
+  text-align: center
+
+#add_attr_type
+  margin: 12px auto 0
+  display: block
+
+#generate
+  background: rgba(255, 255, 255, .8)
+  padding: 30px 40px
+  margin: 0 auto 0
+  display: inline-block
+  text-align: left
+  h2
+    float: left
+    margin: 0 20px 0 0
+    font-size: 16px
+    font-weight: normal
+    line-height: 40px
+  #attrs
+    float: left
+  #actions
+    clear: both
+
+#action
+  padding: 30px 0 0
+  clear: both
+
+=button($button-color: $button_yellow)
+  display: block
+  color: lighten($black, 8%)
+  font-size: 20px
+  font-weight: bold
+  line-height: 20px
+  text-decoration: none
+  border-radius: 6px
+  text-shadow: rgba(255, 255, 255, 0.4) 0 1px 0
+  padding: 8px 20px
+  border: darken($button-color, 32%) solid 1px
+  box-shadow: rgba(255, 255, 255, 0.8) 0 1px 0 inset, rgba(0, 0, 0, 0.2) 0 1px 0
+  background: linear-gradient($button-color, darken($button-color, 18%))
+  cursor: pointer
+  &:hover
+    background: linear-gradient(darken($button-color, 6%), darken($button-color, 12%))
+  &:active
+    box-shadow: rgba(0, 0, 0, 0.1) 0 1px 1px inset, rgba(255, 255, 255, 0.1) 0 1px 0
+
+#generate_submit
+  +button
+  margin: 0 auto
+
+.new_attr
+  display: block
+  background: rgba(0, 0, 0, .1)
+  padding: 8px 12px
+  margin: 0 0 6px
+  .separator
+    display: inline-block
+    margin: 0 8px
+  input[type="text"]
+    width: 220px
+
+#__hocus_pocus_container__
+  background: rgba(0, 0, 0, .4)
+  position: absolute
+  right: 0
+  top: 0
+  padding: 20px
+  color: $white
+  a
+    color: $white
+    text-decoration: none
+    &:hover
+      color: #FFC3C3
+  pre
+    color: $yellow
+    margin: 20px 40px

data/engines/generator/app/views/hocus_pocus/generator/generator/index.html.erb

@@ -1,33 +1,43 @@
 <html>
   <head>
     <title>generator</title>
+    <%= stylesheet_link_tag 'generator' %>
     <%= javascript_include_tag 'application' %>
     <%= csrf_meta_tags %>
     <script type="text/javascript">
       $(document).on('click', '#add_attr_type', function() {
           var i = $('#attr_type input').length;
-          $('#attr_type').append('<%= escape_javascript text_field_tag('attr[@]', '', :style => 'width: 50px') %>:<%= escape_javascript(type_select 'type[@]', :class => 'type') %>'.replace(/@/g, i));
+          $('#attr_type').append('<span class="new_attr"><%= escape_javascript text_field_tag('attr[@]', '') %><span class="separator">:</span><%= escape_javascript(type_select 'type[@]', :class => 'type') %></span>'.replace(/@/g, i));
           $('#attr_' + i).focus();
       })
     </script>
   </head>
   <body>
-    <h1>generate scaffold</h1>
-    <%= form_tag scaffold_generator_path, :remote => true, :id => 'generator_form' do %>
-      <% if @name.include? '_' %>
-        g scaffold
-        <%= select_tag :name, options_for_select([@name, @name.gsub('_', '/')]) %>
-      <% else %>
-        g scaffold <%= @name %>
-        <%= hidden_field_tag :name, @name %>
-      <% end %>
-      <%= hidden_field_tag :return_path, params[:return_path] %>
-      <span id="attr_type">
-        <%= text_field_tag 'attr[0]', '', :style => 'width: 50px', :autofocus => true %>:<%= type_select 'type[0]', :class => 'type' %>
-      </span>
-      <input type="button" value="add attribute" id="add_attr_type">
-      <br>
-      <%= submit_tag 'generate' %>
-    <% end %>
+    <div id="container">
+      <div id="generate">
+        <h1>Generate Scaffold</h1>
+        <%= form_tag scaffold_generator_path, :remote => true, :id => 'generator_form' do %>
+          <h2>
+            <% if @name.include? '_' %>
+              g scaffold
+              <%= select_tag :name, options_for_select([@name, @name.gsub('_', '/')]) %>
+            <% else %>
+              g scaffold <%= @name %>
+              <%= hidden_field_tag :name, @name %>
+            <% end %>
+          </h2>
+          <%= hidden_field_tag :return_path, params[:return_path] %>
+          <div id="attrs">
+            <div id="attr_type">
+              <span class="new_attr"><%= text_field_tag 'attr[0]', '', :autofocus => true %><span class="separator">:</span><%= type_select 'type[0]', :class => 'type' %></span>
+            </div>
+            <input type="button" value="add attribute" id="add_attr_type">
+          </div>
+          <div id="action">
+            <%= submit_tag 'Generate', :id => "generate_submit" %>
+          </div>
+        <% end %>
+      </div>
+    </div>
   </body>
 </html>

data/engines/recorder/app/assets/stylesheets/recorder.css.sass

@@ -0,0 +1,44 @@
+#__hocus_pocus_container__
+  =button($button-color: #ffffff)
+    display: block
+    color: #444444
+    font-size: 10px
+    font-weight: bold
+    line-height: 12px
+    text-decoration: none
+    border-radius: 4px
+    text-shadow: rgba(255, 255, 255, 0.4) 0 1px 0
+    padding: 4px 0
+    box-shadow: rgba(255, 255, 255, 0.4) 0 1px 0 inset
+    background: linear-gradient($button-color, darken($button-color, 18%))
+    cursor: pointer
+    width: 70px
+    text-align: center
+    &:hover
+      background: linear-gradient(darken($button-color, 6%), darken($button-color, 12%))
+    &:active
+      box-shadow: rgba(0, 0, 0, 0.1) 0 1px 1px inset
+  background: rgba(0, 0, 0, .2)
+  position: absolute
+  right: 0
+  top: 0
+  padding: 12px
+  color: #fff
+  a
+    color: #fff
+    text-decoration: none
+    display: block
+    &.edit,
+    &.partials
+      margin: 0 0 12px
+      +button(#ffffff)
+    &.spec
+      +button(#ffffff)
+    &.clear:hover
+      background: transparent
+
+  pre
+    color: #ffff4f
+    background: transparent
+    margin: 0
+    padding: 20px 40px

data/engines/recorder/app/views/hocus_pocus/recorder/recorder/index.js.erb

@@ -1 +1 @@
-$('#<%= HocusPocus::CONTAINER %> div.spec').toggle().html('<pre><%= escape_javascript(flash[HocusPocus::Recorder::SPEC]) + '\n  end' if flash[HocusPocus::Recorder::SPEC] %></pre><div align="right"><a href="/hocus_pocus/recorder" data-remote="true" data-method="delete">Clear</a></div></div>')
+$('#<%= HocusPocus::CONTAINER %> div.spec').toggle().html('<pre><%= escape_javascript(flash[HocusPocus::Recorder::SPEC]) + '\n  end' if flash[HocusPocus::Recorder::SPEC] %></pre><div align="right"><a href="/hocus_pocus/recorder" data-remote="true" data-method="delete" class="clear">Clear</a></div></div>')

data/engines/recorder/lib/hocus_pocus/recorder/middleware.rb

@@ -13,19 +13,19 @@ module HocusPocus
         @app.call(env).tap do |status, headers, body|
           if body.is_a?(ActionDispatch::Response) && body.request.format.html? && (body.request.path !~ %r[^/*hocus_pocus/])
             body.body = insert_text body.body, :before, /<\/head>/i, %Q[<script src="/assets/recorder.js"></script>]
-            body.body = insert_text body.body, :after, /<div id="#{HocusPocus::CONTAINER}" .*?>/i, %Q[#{spec_link}<br>#{spec}]
+            body.body = insert_text body.body, :after, /<div id="#{HocusPocus::CONTAINER}" .*?>/i, %Q[#{spec_link}#{spec}]
           end
         end
       end
 
       private
       def spec_link
-        %Q[<a href="/hocus_pocus/recorder" data-remote="true">spec</a>]
+        %Q[<a href="/hocus_pocus/recorder" data-remote="true" class="spec">spec</a>]
       end
 
       def spec
         #FIXME more assertions
-        %Q[<div class="spec" style="display:none"><div align="right"><a href="/hocus_pocus/recorder" data-remote="true" data-method="delete">Clear</a></div></div>]
+        %Q[<div class="spec" style="display:none"><div align="right"><a href="/hocus_pocus/recorder" data-remote="true" data-method="delete" class="clear">Clear</a></div></div>]
       end
     end
   end

data/lib/hocus_pocus/middleware.rb

@@ -11,7 +11,7 @@ module HocusPocus
     def call(env)
       @app.call(env).tap do |status, headers, body|
         if body.is_a?(ActionDispatch::Response) && (body.request.path !~ %r[^/*hocus_pocus/])
-          body.body = insert_text body.body, :before, /<\/body>/i, %Q[<div id="#{HocusPocus::CONTAINER}" style="position:absolute; top:0; right: 0; font-size: small;"></div>]
+          body.body = insert_text body.body, :before, /<\/body>/i, %Q[<div id="#{HocusPocus::CONTAINER}" style="position:absolute; top:0; right: 0;"><link href="/assets/recorder.css" media="all" rel="stylesheet" type="text/css"></div>]
         end
       end
     end

data/lib/hocus_pocus/version.rb

@@ -1,3 +1,3 @@
 module HocusPocus
-  VERSION = '0.2.1'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hocus_pocus
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Akira Matsuda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-16 00:00:00.000000000 Z
+date: 2013-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nested_scaffold
@@ -45,6 +45,7 @@ files:
 - engines/command_line/lib/hocus_pocus/command_line/engine.rb
 - engines/command_line/lib/hocus_pocus/command_line/middleware.rb
 - engines/command_line/lib/hocus_pocus/command_line/railtie.rb
+- engines/editor/app/assets/stylesheets/editor.css.sass
 - engines/editor/app/controllers/hocus_pocus/editor/editor_controller.rb
 - engines/editor/app/views/hocus_pocus/editor/editor/_editor.html.erb
 - engines/editor/app/views/hocus_pocus/editor/editor/index.js.erb
@@ -53,6 +54,7 @@ files:
 - engines/editor/lib/hocus_pocus/editor/engine.rb
 - engines/editor/lib/hocus_pocus/editor/middleware.rb
 - engines/editor/lib/hocus_pocus/editor/railtie.rb
+- engines/generator/app/assets/stylesheets/generator.css.sass
 - engines/generator/app/controllers/hocus_pocus/generator/generator_controller.rb
 - engines/generator/app/helpers/hocus_pocus/generator/generator_helper.rb
 - engines/generator/app/views/hocus_pocus/generator/generator/index.html.erb
@@ -60,6 +62,7 @@ files:
 - engines/generator/config/routes.rb
 - engines/generator/lib/hocus_pocus/generator/engine.rb
 - engines/generator/lib/hocus_pocus/generator/railtie.rb
+- engines/recorder/app/assets/stylesheets/recorder.css.sass
 - engines/recorder/app/controllers/hocus_pocus/recorder/recorder_controller.rb
 - engines/recorder/app/views/hocus_pocus/recorder/recorder/destroy.js.erb
 - engines/recorder/app/views/hocus_pocus/recorder/recorder/index.js.erb