better_helpers 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 177556adb63a634d36214319a642a9a5fc058817
-  data.tar.gz: 43af52bb3c31ac178b90728bad4ccfdcfbc37779
+  metadata.gz: 59e0dcdc57a82caa0ac352e95c921c38cb5c1538
+  data.tar.gz: be6447d2ce60248ec87aebcef3eaf43fdb760f5e
 SHA512:
-  metadata.gz: 73bc5487a07a4c4e712e7e6f037a7cf5e3c47f610998ce91ed2346d4abab57d2a39dc1255344d6afd7adb96c1b9cc7a4dd26098de546e12dffbd16ca24a52686
-  data.tar.gz: d798c4bdba0e27e5cac1ce41795314dc0c9eae9681ae2a31f313d9aa997c8f1ca7c04f8faa76675d4363c4e40d2fccc49c68c745b8a2b89238dfc8ca58ab5e56
+  metadata.gz: 6c2194c8a920d73f7dc3e045b14696903eabf754907e7670f6569e7cc51183266eb0d2d75b6a3f8b92734ec935864a1f632fa2065a96edc5a86816ae3279a253
+  data.tar.gz: 0adac9536f828fa06408acceb23e7bc3af7e3e540a34bc440daf63ca5ed8f7080ebc96d62538d78913b133a5c6f5bf324dc6fb8d8db539aeaf786c69e6d039ae

data/lib/better_helpers.rb

@@ -4,7 +4,7 @@ require "action_view"
 require "better_helpers/version"
 require "better_helpers/base"
 require "better_helpers/namespace_to_hash"
-require "better_helpers/hash_to_object"
+require "better_helpers/hash_hierarchy_to_class"
 
 module BetterHelpers
 end

data/lib/better_helpers/base.rb

@@ -6,6 +6,10 @@ module BetterHelpers
     end
 
     module ClassMethods
+      def self.extended base
+        @@BetterHelpersMasterHelper ||= Class.new
+      end
+
       def better_helpers namespace = nil, &block
         helper_class = Class.new(&block)
         helper_class.class_eval do
@@ -20,7 +24,7 @@ module BetterHelpers
         name = names.shift
 
         hash = NamespaceToHash.new(helper_class, names).perform
-        value = HashToObject.new(hash).perform
+        value = HashHierarchyToClass.new(hash, @@BetterHelpersMasterHelper).apply
 
         self.send(:define_method, name) { value }
       end

data/lib/better_helpers/hash_hierarchy_to_class.rb

@@ -0,0 +1,39 @@
+module BetterHelpers
+  class HashHierarchyToClass
+
+    def initialize hash, parent_class
+      @hash = hash
+      @parent_class = parent_class
+    end
+
+    def apply
+      value = apply_to_class @hash, @parent_class.new
+      @hash.keys.first.nil? ? value : @parent_class.new
+    end
+
+    private
+    def apply_to_class obj, parent_obj
+      if obj.is_a? Hash
+        key = obj.keys.first
+        value = obj[key]
+
+        return value if key.nil?
+
+        if parent_obj.respond_to?(key)
+          apply_to_class value, parent_obj.send(key)
+        else
+
+          klass = Class.new
+          instance = klass.new
+          return_obj = apply_to_class value, instance
+
+          parent_obj.class.send(:define_method, key) { return_obj }
+          return parent_obj
+        end
+      end
+
+      obj
+    end
+
+  end
+end

data/lib/better_helpers/version.rb

@@ -1,3 +1,3 @@
 module BetterHelpers
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/better_helpers/base_spec.rb

@@ -56,6 +56,28 @@ describe BetterHelpers::Base do
         helpers.custom_helper.helper_method.should eql "test4"
       end
     end
+
+    context "for helpers sharing a module" do
+      let :helpers do
+        Module.new do
+          extend InsideModuleHelper::A::B
+          extend InsideModuleHelper::A::C
+        end
+      end
+
+      it "should include both helpers in the same module" do
+        helpers.should respond_to :inside_module_helper
+        helpers.inside_module_helper.should respond_to :a
+        helpers.inside_module_helper.a.should respond_to :b
+        helpers.inside_module_helper.a.should respond_to :c
+
+        helpers.inside_module_helper.a.b.should respond_to :helper_method
+        helpers.inside_module_helper.a.c.should respond_to :helper_method
+
+        helpers.inside_module_helper.a.b.helper_method.should eql "test3"
+        helpers.inside_module_helper.a.c.helper_method.should eql "test6"
+      end
+    end
   end
 
 end

data/spec/better_helpers/hash_hierarchy_to_class_spec.rb

@@ -0,0 +1,131 @@
+require "spec_helper"
+
+describe BetterHelpers::HashHierarchyToClass do
+
+  let :parent_class do
+    Class.new
+  end
+
+  let :hash do
+    {a: {b: {c: 1}}}
+  end
+
+  let :apply do
+    BetterHelpers::HashHierarchyToClass.new(hash, parent_class).apply
+  end
+
+  describe "when modifying the class" do
+    subject { parent_class.new }
+
+    context "for unique modules" do
+      before { apply }
+
+      it "should include the methods into the parent class" do
+        apply
+        subject.should respond_to :a
+        subject.should_not respond_to :b
+        subject.should_not respond_to :c
+
+        subject.a.should respond_to :b
+        subject.a.should_not respond_to :a
+        subject.a.should_not respond_to :c
+
+        subject.a.b.should respond_to :c
+        subject.a.b.should_not respond_to :a
+        subject.a.b.should_not respond_to :b
+
+        subject.a.b.c.should eql 1
+      end
+
+      it "should allow new instances with the same methods" do
+        apply
+        instance2 = parent_class.new
+        instance3 = parent_class.new
+
+        [instance2, instance3].each do |instance|
+          instance.should respond_to :a
+          instance.should_not respond_to :b
+          instance.should_not respond_to :c
+
+          instance.a.should respond_to :b
+          instance.a.should_not respond_to :a
+          instance.a.should_not respond_to :c
+
+          instance.a.b.should respond_to :c
+          instance.a.b.should_not respond_to :a
+          instance.a.b.should_not respond_to :b
+
+          instance.a.b.c.should eql 1
+        end
+      end
+    end
+
+    context "for different modules with the same parent" do
+      let :hash1 do
+        {a: {b: {d: 1}}}
+      end
+
+      let :hash2 do
+        {a: {c: {d: 2}}}
+      end
+
+      before do
+        BetterHelpers::HashHierarchyToClass.new(hash1, parent_class).apply
+        BetterHelpers::HashHierarchyToClass.new(hash2, parent_class).apply
+      end
+
+      it "should define the method in the parent class" do
+        subject.should respond_to :a
+        subject.should_not respond_to :b
+        subject.should_not respond_to :c
+        subject.should_not respond_to :d
+
+        subject.a.should respond_to :b
+        subject.a.should respond_to :c
+        subject.a.should_not respond_to :a
+        subject.a.should_not respond_to :d
+
+        subject.a.b.should respond_to :d
+        subject.a.b.should_not respond_to :a
+        subject.a.b.should_not respond_to :b
+        subject.a.b.should_not respond_to :c
+
+        subject.a.b.d.should eql 1
+
+        subject.a.c.should respond_to :d
+        subject.a.c.should_not respond_to :a
+        subject.a.c.should_not respond_to :b
+        subject.a.c.should_not respond_to :c
+
+        subject.a.c.d.should eql 2
+      end
+    end
+  end
+
+  describe "when returning value" do
+    subject { apply }
+
+    context "when key is nil" do
+      let :hash do
+        {nil => 1}
+      end
+
+      it "should return the value" do
+        subject.should eql 1
+      end
+    end
+
+    context "when exist some hierarchy" do
+      let :hash do
+        {a: {b: 1}}
+      end
+
+      it "should return an instance of a callable object" do
+        subject.should respond_to :a
+        subject.a.should respond_to :b
+        subject.a.b.should eql 1
+      end
+    end
+  end
+
+end

data/spec/fixtures/inside_module_helper.rb

@@ -11,5 +11,17 @@ module InsideModuleHelper
 
       end
     end
+
+    module C
+      include BetterHelpers::Base
+
+      better_helpers do
+
+        def helper_method
+          "test6"
+        end
+
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: better_helpers
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - tulios
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-07 00:00:00.000000000 Z
+date: 2014-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -86,11 +86,11 @@ files:
 - better_helpers.gemspec
 - lib/better_helpers.rb
 - lib/better_helpers/base.rb
-- lib/better_helpers/hash_to_object.rb
+- lib/better_helpers/hash_hierarchy_to_class.rb
 - lib/better_helpers/namespace_to_hash.rb
 - lib/better_helpers/version.rb
 - spec/better_helpers/base_spec.rb
-- spec/better_helpers/hash_to_object_spec.rb
+- spec/better_helpers/hash_hierarchy_to_class_spec.rb
 - spec/better_helpers/namespace_to_hash_spec.rb
 - spec/fixtures/another_helper.rb
 - spec/fixtures/inside_module_custom_helper.rb
@@ -117,13 +117,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: It is a better way to organize and maintain your Rails helpers
 test_files:
 - spec/better_helpers/base_spec.rb
-- spec/better_helpers/hash_to_object_spec.rb
+- spec/better_helpers/hash_hierarchy_to_class_spec.rb
 - spec/better_helpers/namespace_to_hash_spec.rb
 - spec/fixtures/another_helper.rb
 - spec/fixtures/inside_module_custom_helper.rb

data/lib/better_helpers/hash_to_object.rb

@@ -1,28 +0,0 @@
-module BetterHelpers
-  class HashToObject
-    def initialize obj
-      @obj = obj
-    end
-
-    def perform
-      generate_obj @obj
-    end
-
-    private
-    def generate_obj obj
-      if obj.is_a? Hash
-        key = obj.keys.first
-        value = obj[key]
-
-        return value if key.nil?
-        return_obj = generate_obj value
-
-        c = Class.new
-        c.send(:define_method, key) { return_obj }
-        return c.new
-      end
-
-      obj
-    end
-  end
-end

data/spec/better_helpers/hash_to_object_spec.rb

@@ -1,36 +0,0 @@
-require "spec_helper"
-
-describe BetterHelpers::HashToObject do
-
-  let :hash do
-    {
-      a: {
-        b: {
-          c: 1
-        }
-      }
-    }
-  end
-
-  subject do
-    BetterHelpers::HashToObject.new(hash).perform
-  end
-
-  it "should generate nested objects following the hash structure" do
-    subject.should respond_to :a
-    subject.a.should respond_to :b
-    subject.a.b.should respond_to :c
-    subject.a.b.c.should eql 1
-  end
-
-  describe "when key is nil" do
-    let :hash do
-      {nil => 1}
-    end
-
-    it "should return the value" do
-      subject.should eql 1
-    end
-  end
-
-end