navigator 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50aeb1e3d4da2ff847558e659609b7c05eb9943b
-  data.tar.gz: a5d04fbcb4d629600980986a8c393fab5f7fbc18
+  metadata.gz: 2a11b6a19132990de70a6d893a6c07853467cdf7
+  data.tar.gz: a188cf95ab843f75dd9905ff3a3bc3cbe5acc5aa
 SHA512:
-  metadata.gz: efb8decf8ffa561b31ea79bb521e5998dec794c7e409d9b6baac45283fd91b56a69dfe563176526ef1059c922543e1337f29fe1f2a655c2a94de0fac1c656a14
-  data.tar.gz: 62ae481797701da993c1fa1c9a656574c433e6f02c147e0aefe9ca2ea50b637048aaed266eb9db7fd869eb37ad721bc8d7006ac7efba0ddb88073c2595e4fe43
+  metadata.gz: 707fc48650e9a14065c432b36728482ff828feeeade12b999f0b5bd6eb2cbba31962172ae0ee19aee9be584cd51cf56e39462c23175fd7bdebc762dd730e5aea
+  data.tar.gz: bc525f9d29980668aad48cbb10c0a2a751ca6f6f0c325919bab2e32363e9665e2e313a4424a9d60f10840e64ba1633d66caa160fa03420c2d05c0991724ee814

data/README.md

@@ -23,7 +23,7 @@ Enhances Rails with a DSL for menu navigation.
     * [MRI 2.x.x](http://www.ruby-lang.org)
     * [JRuby 1.x.x](http://jruby.org)
     * [Rubinius 2.x.x](http://rubini.us)
-0. [Ruby on Rails 4.x.x](http://rubyonrails.org).
+0. [Ruby on Rails 4.1.x](http://rubyonrails.org).
 
 # Setup
 
@@ -255,6 +255,11 @@ To test, run:
 
     bundle exec rspec spec
 
+To test the dummy application, run:
+
+    cd spec/dummy
+    bin/rails server
+
 # Versioning
 
 Read [Semantic Versioning](http://semver.org) for details. Briefly, it means:

data/lib/navigator.rb

@@ -2,14 +2,4 @@ require "navigator/version"
 require "navigator/tag_activator"
 require "navigator/tag"
 require "navigator/menu"
-
-# Rails Enhancements
-if defined? Rails
-  # Dependencies
-  require "navigator/action_view/instance_methods"
-
-  # View
-  if defined? ActionView
-    ActionView::Base.send :include, Navigator::ActionView
-  end
-end
+require "navigator/engine"

data/lib/navigator/engine.rb

@@ -0,0 +1,11 @@
+module Navigator
+  class Engine < ::Rails::Engine
+    isolate_namespace Navigator
+
+    initializer "navigator.action_controller" do |app|
+      ActiveSupport.on_load :action_controller do
+        helper Navigator::Engine.helpers
+      end
+    end
+  end
+end

data/lib/navigator/tag.rb

@@ -11,7 +11,7 @@ module Navigator
     end
 
     def prefix
-      ["<#{name}", formatted_attributes, '>'].compact * ''
+      ["<#{name}", format_attributes, '>'].compact * ''
     end
 
     def suffix
@@ -26,16 +26,20 @@ module Navigator
 
     attr_reader :attributes, :activator
 
-    def expand_data_attributes!
-      if attributes.key? :data
-        attributes[:data].each { |key, value| attributes["data-#{key}"] = value }
-        attributes.delete :data
+    def expand_data_attributes! attrs
+      if attrs.key? :data
+        attrs.delete(:data).each { |key, value| attrs["data-#{key}"] = value }
       end
     end
 
-    def formatted_attributes
-      expand_data_attributes!
-      attrs = activator.activate(attributes).map { |key, value| %(#{key}="#{value}") } * ' '
+    def concatenate_attributes attrs
+      activator.activate(attrs).map { |key, value| %(#{key}="#{value}") } * ' '
+    end
+
+    def format_attributes
+      attrs = attributes.clone
+      expand_data_attributes! attrs
+      attrs = concatenate_attributes attrs
       attrs.empty? ? nil : " #{attrs}"
     end
   end

data/lib/navigator/version.rb

@@ -1,3 +1,3 @@
 module Navigator
-  VERSION = "0.8.0"
+  VERSION = "0.9.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: navigator
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Brooke Kuhlmann
@@ -30,7 +30,7 @@ cert_chain:
   fMlZDUGx3lQarp/vPjK+6XH7DLXjBEKqeIGBIpLthYUvDxJRp23C+T3liGSL32vg
   mSpxxwmK95GDFuEy2mNPaxnazdkw8c+7DbrSpzd/CnNZkRgitxOavs8=
   -----END CERTIFICATE-----
-date: 2014-07-10 00:00:00.000000000 Z
+date: 2014-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry-byebug
@@ -66,14 +66,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -144,6 +144,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: capybara
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
   requirement: !ruby/object:Gem::Requirement
@@ -198,7 +212,7 @@ files:
 - LICENSE.md
 - README.md
 - lib/navigator.rb
-- lib/navigator/action_view/instance_methods.rb
+- lib/navigator/engine.rb
 - lib/navigator/menu.rb
 - lib/navigator/tag.rb
 - lib/navigator/tag_activator.rb

data/lib/navigator/action_view/instance_methods.rb

@@ -1,23 +0,0 @@
-module Navigator
-  module ActionView
-    def self.included base
-      base.send :include, InstanceMethods
-    end
-
-    module InstanceMethods
-      def navigation tag = "ul", attributes = {}, activator = navigation_activator, &block
-        raw Menu.new(self, tag, attributes, activator, &block).render
-      end
-
-      module_function
-
-      def current_path
-        request.env["PATH_INFO"]
-      end
-
-      def navigation_activator
-        Navigator::TagActivator.new search_value: current_path
-      end
-    end
-  end
-end