bullseye 0.0.4 → 0.0.7

data/README.md

@@ -52,6 +52,14 @@ alert("I am showing a site");
 alert "I am also showing a site"
 ```
 
+Want to use the same JavaScript for two actions, say `new` and `edit`? Put both actions in the filename separated by a dash:
+
+``` coffeescript
+# app/assets/javascripts/bullseye/sites/new-edit.bullseye.coffee
+
+alert "I appear on both the new and edit actions"
+```
+
 Want to target that page in your Sass? Use a little string interpolation and a function that generates a selector:
 
 ``` sass
@@ -75,13 +83,30 @@ Create an initializer, like `config/initializers/bullseye.rb` and add the follow
 Bullseye.configure do |config|
   config.fuzzy_search = %{$('body').get(0).classNames.split(/\\s+/)}
   config.css_selector = 'body.:action.:controller'
+  config.html_tag = { 'class' => ':action :controller' }
 end
 ```
 
 Then you can make your `controller/action.bullseye` files and everything should just work.
 
+## Force the name of the controller/action
+
+For things like error handling in `rescue_from`, you can force the `action` and `controller` that
+Bullseye will use:
+
+``` ruby
+rescue_from StandardError do |e|
+  bullseye_target 'application/errors/http_500'
+
+  render 'http_500'
+end
+```
+
+This will resolve to the controller `application/errors` and the action `http_500` in the Bullseye
+HTML `body` tag for that page.
+
 ## Hacking
 
 _You'll need to install [Penchant](http://github.com/johnbintz/penchant) to mess with the Gemfile
-during development._
+during development.
 

data/app/assets/javascripts/bullseye.js.erb

@@ -1,7 +1,11 @@
 this.Bullseye = {
-  target: function(controller, action, callback) {
+  target: function(controller, actions, callback) {
     this.targets[controller] = (this.targets[controller] || {});
-    this.targets[controller][action] = callback;
+
+    var actions_i;
+    for (actions_i = 0; actions_i < actions.length; ++actions_i) {
+      this.targets[controller][actions[actions_i]] = callback;
+    }
   },
 
   targets: {},
@@ -34,6 +38,8 @@ this.Bullseye = {
         break;
     }
 
+    controller = controller.replace('/', '-');
+
     if (this.targets[controller] && this.targets[controller][action]) {
       this.targets[controller][action].apply(this.context);
     }

data/lib/bullseye.rb

@@ -5,16 +5,7 @@ require 'bullseye/sass/bullseye_functions'
 
 module Bullseye
   class Configuration
-    attr_accessor :js_controller_search, :js_action_search, :css_selector, :fuzzy_search
-
-    def initialize
-      @js_controller_search = %{$('body').data('controller')}
-      @js_action_search = %{$('body').data('action')}
-
-      @css_selector = %{body[data-action=':action'][data-controller=':controller']}
-
-      @fuzzy_search = false
-    end
+    attr_accessor :js_controller_search, :js_action_search, :css_selector, :html_tag, :fuzzy_search
   end
 
   class << self
@@ -27,3 +18,4 @@ module Bullseye
     end
   end
 end
+

data/lib/bullseye/engine.rb

@@ -1,14 +1,34 @@
 require 'bullseye/helpers/bullseye_helper'
+require 'bullseye/helpers/bullseye_controller_helper'
 
 module Bullseye
   class Engine < ::Rails::Engine
     initializer 'bullseye.view_helpers' do
       ActionView::Base.send(:include, Bullseye::Helpers::BullseyeHelper)
+      ActionController::Base.send(:include, Bullseye::Helpers::BullseyeControllerHelper)
     end
 
     initializer 'bullseye.sprockets', :after => 'sprockets.environment' do |app|
       app.assets.register_engine '.bullseye', Bullseye::Tilt::BullseyeTemplate
     end
   end
+
+  class InstallGenerator < ::Rails::Generators::Base
+    source_root File.expand_path('../../../skel', __FILE__)
+
+    def create_initializer_file
+      copy_file "config/initializers/bullseye.rb", "config/initializers/bullseye.rb"
+
+      puts
+      puts "Add to your main application.js file:"
+      puts
+      puts "//= require bullseye"
+      puts
+      puts "and replace your body tag layouts/application.html with a call to bullseye_body:"
+      puts
+      puts "= bullseye_body do"
+      puts
+    end
+  end
 end
 

data/lib/bullseye/find_parts.rb

@@ -0,0 +1,26 @@
+module Bullseye
+  module FindParts
+    SEPARATOR = '-'
+
+    def actions
+      parts.last.split(SEPARATOR)
+    end
+
+    def controller
+      parts[0..-2].join(SEPARATOR)
+    end
+
+    def parts
+      @parts ||= @source.split('/')
+    end
+
+    class PartFinder
+      include Bullseye::FindParts
+
+      def initialize(source)
+        @source = source
+      end
+    end
+  end
+end
+

data/lib/bullseye/helpers/bullseye_controller_helper.rb

@@ -0,0 +1,14 @@
+require 'bullseye/find_parts'
+
+module Bullseye
+  module Helpers
+    module BullseyeControllerHelper
+      def bullseye_target(target)
+        part_finder = Bullseye::FindParts::PartFinder.new(target)
+
+        @__bullseye_action = part_finder.actions.first
+        @__bullseye_controller = part_finder.controller
+      end
+    end
+  end
+end

data/lib/bullseye/helpers/bullseye_helper.rb

@@ -2,7 +2,20 @@ module Bullseye
   module Helpers
     module BullseyeHelper
       def bullseye_body(options = {}, &block)
-        content_tag(:body, capture(&block), { 'data-action' => action_name, 'data-controller' => controller_path }.merge(options)).html_safe
+        attributes = Bullseye.config.html_tag.collect do |key, value|
+          [ key, value.gsub(':action', __bullseye_action).gsub(':controller', __bullseye_controller) ]
+        end
+
+        content_tag(:body, capture(&block), Hash[attributes].merge(options)).html_safe
+      end
+
+      private
+      def __bullseye_action
+        @__bullseye_action || action_name
+      end
+
+      def __bullseye_controller
+        @__bullseye_controller || controller_path.gsub('/', Bullseye::FindParts::SEPARATOR)
       end
     end
   end

data/lib/bullseye/sass/bullseye_functions.rb

@@ -1,14 +1,17 @@
 require 'sass'
+require 'bullseye/find_parts'
 
 module Sass::Script::Functions
   def bullseye(target)
     assert_type target, :String
 
-    parts = target.value.split('/')
-    action = parts.pop
-    controller = parts.join('/')
+    part_finder = Bullseye::FindParts::PartFinder.new(target.value)
 
-    Sass::Script::String.new(Bullseye.config.css_selector.gsub(':action', action).gsub(':controller', controller))
+    selectors = part_finder.actions.collect do |action|
+      Bullseye.config.css_selector.gsub(':action', action).gsub(':controller', part_finder.controller)
+    end
+
+    Sass::Script::String.new(selectors.join(','))
   end
 end
 

data/lib/bullseye/tilt/bullseye_template.rb

@@ -1,10 +1,11 @@
 require 'tilt'
-require 'bullseye/tilt/find_parts'
+require 'bullseye/find_parts'
+require 'json'
 
 module Bullseye
   module Tilt
     class BullseyeTemplate < ::Tilt::Template
-      include Bullseye::Tilt::FindParts
+      include Bullseye::FindParts
 
       def self.default_mime_type
         'application/javascript'
@@ -14,10 +15,10 @@ module Bullseye
       end
 
       def evaluate(scope, locals, &block)
-        @scope = scope
+        @source = scope.logical_path.gsub(%r{^[^/]*/}, '')
 
         <<-JS
-Bullseye.target('#{controller}', '#{action}', function() {
+Bullseye.target('#{controller}', #{actions.to_json}, function() {
   #{data}
 });
         JS

data/lib/bullseye/version.rb

@@ -1,3 +1,3 @@
 module Bullseye
-  VERSION = "0.0.4"
+  VERSION = "0.0.7"
 end

data/skel/config/initializers/bullseye.rb

@@ -0,0 +1,9 @@
+Bullseye.configure do |c|
+  c.js_controller_search = %{$('body').data('controller')}
+  c.js_action_search = %{$('body').data('action')}
+
+  c.css_selector = %{body[data-action=':action'][data-controller=':controller']}
+  c.html_tag = { 'data-action' => ':action', 'data-controller' => ':controller' }
+
+  c.fuzzy_search = false
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bullseye
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-29 00:00:00.000000000 Z
+date: 2012-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
@@ -76,10 +76,11 @@ files:
 - bullseye.gemspec
 - lib/bullseye.rb
 - lib/bullseye/engine.rb
+- lib/bullseye/find_parts.rb
+- lib/bullseye/helpers/bullseye_controller_helper.rb
 - lib/bullseye/helpers/bullseye_helper.rb
 - lib/bullseye/sass/bullseye_functions.rb
 - lib/bullseye/tilt/bullseye_template.rb
-- lib/bullseye/tilt/find_parts.rb
 - lib/bullseye/version.rb
 - script/gemfile
 - script/hooks/commit-msg
@@ -87,6 +88,7 @@ files:
 - script/hooks/pre-commit
 - script/initialize-environment
 - script/install-git-hooks
+- skel/config/initializers/bullseye.rb
 homepage: ''
 licenses: []
 post_install_message: 
@@ -99,12 +101,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2184598113518927459
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2184598113518927459
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -112,4 +120,3 @@ signing_key:
 specification_version: 3
 summary: Implement DOM-ready execution in Rails using the Asset Pipeline.
 test_files: []
-has_rdoc: 

data/lib/bullseye/tilt/find_parts.rb

@@ -1,18 +0,0 @@
-module Bullseye
-  module Tilt
-    module FindParts
-      def action
-        parts.last
-      end
-
-      def controller
-        parts[0..-2].join('/')
-      end
-
-      def parts
-        @scope.logical_path.split('/')[1..-1]
-      end
-    end
-  end
-end
-