angular_sprinkles 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b64d257dda0cf1e8a99f220b37cd4038d4cf8cf
-  data.tar.gz: 4a6c9bc4529978427aff6c3b4ba8e14b997bd7fd
+  metadata.gz: 63255ac5499bbd7a2c8e7445bbd83abde35e2b9c
+  data.tar.gz: c094e71015dfec90b47ff9a84bad5002b6cb19b4
 SHA512:
-  metadata.gz: d198024dbbfba69d739051c5df36717df41a62eab9792b794da9dfcdad20b35557e2fcf809ec9d4832c3c44b361a43e789cd56d4fc65cdcbf83483abd557e264
-  data.tar.gz: 2159d526dde0559420cf6144e025b1fbaa5b2a057156153d11dafa507d833bc21ce030a76d9d26dc40900550e3ab3027b791c1c773906e6dbd6e7013882d00a4
+  metadata.gz: 9c037097cb261fbac5ba6cc2c566a986ceaa03374fd3ab39a66771c26409ac98923662dfd84889e7e95ed01e8523e522ab3ff7c65457881632e032c1ad0bdcc1
+  data.tar.gz: 83a3d681ac5ec8b42059e25be8f58e543827a46b8bfce601152af50912f357e11a187584a661f069771d847627434e1da05941e4fe80b66182bddef8af8fb5e8

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/angular_sprinkles.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: angular_sprinkles 0.2.0 ruby lib
+# stub: angular_sprinkles 0.2.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "angular_sprinkles"
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
@@ -40,7 +40,6 @@ Gem::Specification.new do |s|
     "lib/angular_sprinkles/directive/input.rb",
     "lib/angular_sprinkles/directive/name.rb",
     "lib/angular_sprinkles/engine.rb",
-    "lib/angular_sprinkles/form_binder.rb",
     "lib/angular_sprinkles/form_binder/base.rb",
     "lib/angular_sprinkles/form_binder/check_box.rb",
     "lib/angular_sprinkles/form_binder/default.rb",
@@ -65,6 +64,9 @@ Gem::Specification.new do |s|
     "spec/angular_sprinkles/directive/html_spec.rb",
     "spec/angular_sprinkles/directive/input_spec.rb",
     "spec/angular_sprinkles/directive/name_spec.rb",
+    "spec/angular_sprinkles/form_binder/base_spec.rb",
+    "spec/angular_sprinkles/form_binder/check_box_spec.rb",
+    "spec/angular_sprinkles/form_binder/default_spec.rb",
     "spec/angular_sprinkles/key_generator_spec.rb",
     "spec/angular_sprinkles/model_decorator_spec.rb",
     "spec/angular_sprinkles/object_key_wrapper_spec.rb",

data/lib/angular_sprinkles/form_binder/base.rb

@@ -13,14 +13,16 @@ module AngularSprinkles
 
       def call
         # Let the original form helper raise the exception
-        return @args if helper_is_going_raise_argument_error?
+        if helper_is_going_raise_argument_error?
+          return @args
+        end
 
-        args_with_binding
+        augment_args
       end
 
       private
 
-      def args_with_binding; raise NotImplementedError; end
+      def augment_args; raise NotImplementedError; end
 
       def helper_is_going_raise_argument_error?
         @args.count < required_parameters.count

data/lib/angular_sprinkles/form_binder/check_box.rb

@@ -3,15 +3,9 @@ module AngularSprinkles
     class CheckBox < Base
       private
 
-      def args_with_binding
-        binding = { 'ng-model' => @attribute_binding }
-
+      def augment_args
         @args.tap do |args|
-          if args.many?
-            args.second.reverse_merge!(binding)
-          else
-            args.push(binding)
-          end
+          args.second.reverse_merge!({ "ng-model" => @attribute_binding })
         end
       end
     end

data/lib/angular_sprinkles/form_binder/default.rb

@@ -3,13 +3,13 @@ module AngularSprinkles
     class Default < Base
       private
 
-      def args_with_binding
-        binding = { 'ng-model' => @attribute_binding }
+      def augment_args
+        binding = { "ng-model" => @attribute_binding }
 
         @args.tap do |args|
           # Assume that optional params default to {}
           # This is a safe assumption for all helpers except check_box
-          (@method.arity.abs - args.count).times { args.push({}) }
+          (@method.parameters.count - args.count).times { args.push({}) }
 
           # The last argument is always the one where ng-model should be appended
           args.last.reverse_merge!(binding)

data/lib/angular_sprinkles/mixins/form_builder.rb

@@ -1,6 +1,6 @@
 module AngularSprinkles
   module Mixins
-    DEFAULT_HELPERS = ActionView::Helpers::FormBuilder.field_helpers - [:label, :fields_for]
+    DEFAULT_HELPERS = ActionView::Helpers::FormBuilder.field_helpers - [:label, :fields_for, :check_box]
     # DATE_HELPERS = [:date_select, :time_select, :datetime_select]
     # SELECT_HELPERS = [:select, :collection_select, :grouped_collection_select, :time_zone_select, :collection_check_boxes, :collection_radio_buttons]
     # ALL_HELPERS = [*DATE_HELPERS, *SELECT_HELPERS, *DEFAULT_HELPERS]
@@ -9,12 +9,18 @@ module AngularSprinkles
       DEFAULT_HELPERS.each do |helper|
         class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
           def bind_#{helper}(*args, &block)
-            params = { helper: :#{helper}, method: method(:#{helper}), args: args, object: @object }
-            args_with_binding = AngularSprinkles::FormBinder.new(params).call
+            params = { method: method(:#{helper}), args: args, object: @object }
+            args_with_binding = AngularSprinkles::FormBinder::Default.new(params).call
             #{helper}(*args_with_binding, &block)
           end
         RUBY_EVAL
       end
+
+      def bind_check_box(*args, &block)
+        params = { method: method(:check_box), args: args, object: @object }
+        args_with_binding = AngularSprinkles::FormBinder::CheckBox.new(params).call
+        check_box(*args_with_binding, &block)
+      end
     end
   end
 end

data/lib/angular_sprinkles.rb

@@ -9,7 +9,6 @@ require "angular_sprinkles/directive/html"
 require "angular_sprinkles/context"
 require "angular_sprinkles/counter"
 require "angular_sprinkles/engine"
-require "angular_sprinkles/form_binder"
 require "angular_sprinkles/form_binder/base"
 require "angular_sprinkles/form_binder/check_box"
 require "angular_sprinkles/form_binder/default"

data/spec/angular_sprinkles/form_binder/base_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+describe AngularSprinkles::FormBinder::Base do
+  let(:method) { ->(name, value, *opts) {} }
+  let(:args) { [:attribute, {}] }
+  let(:attribute_binding) { double }
+  let(:object) { double(bind: attribute_binding) }
+  let(:params) { { method: method, args: args, object: object } }
+
+  subject { described_class.new(params) }
+
+  it 'raises NotImplementedError for augment_args' do
+    expect { subject.call }.to raise_error(NotImplementedError)
+  end
+
+  context "when not enough arguments are given" do
+    let(:args) { [:attribute] }
+
+    it "returns the args so that the original method will raise an exception" do
+      expect(subject.call).to eq(args)
+    end
+  end
+
+  context "when augment_args is implemented by a subclass" do
+    let!(:duped_args) { args.dup }
+
+    before do
+      subject.define_singleton_method(:augment_args, -> {})
+    end
+
+    it 'does not modify the original params' do
+      augmented_args = subject.call
+
+      expect(args).to eq(duped_args)
+      expect(args).not_to eq(augmented_args)
+    end
+  end
+end

data/spec/angular_sprinkles/form_binder/check_box_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe AngularSprinkles::FormBinder::CheckBox do
+  let(:method) { ->(name, value, *opts) {} }
+  let(:args) { [:attribute, {}] }
+  let(:attribute_binding) { double }
+  let(:object) { double(bind: attribute_binding) }
+  let(:params) { { method: method, args: args, object: object } }
+
+  it 'returns the arguments with the second one augmented' do
+    augmented_args = described_class.new(params).call
+    expect(augmented_args.second["ng-model"]).to eq(attribute_binding)
+
+    args.push(1)
+    augmented_args = described_class.new(params).call
+    expect(augmented_args.second["ng-model"]).to eq(attribute_binding)
+
+    args.push(1, 0)
+    augmented_args = described_class.new(params).call
+    expect(augmented_args.second["ng-model"]).to eq(attribute_binding)
+  end
+end

data/spec/angular_sprinkles/form_binder/default_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe AngularSprinkles::FormBinder::Default do
+  let(:method) { ->(arg1, arg2, arg3 = {}, arg4 = {}, arg5 = {}) {} }
+  let(:args) { [:attribute, :something_else] }
+  let(:attribute_binding) { double }
+  let(:object) { double(bind: attribute_binding) }
+  let(:params) { { method: method, args: args, object: object } }
+
+  it 'returns the arguments with the second one augmented' do
+    augmented_args = described_class.new(params).call
+
+    expect(augmented_args[0]).to eq(:attribute)
+    expect(augmented_args[1]).to eq(:something_else)
+    expect(augmented_args[2]).to eq({})
+    expect(augmented_args[3]).to eq({})
+    expect(augmented_args[4]).to eq({ "ng-model" => attribute_binding })
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: angular_sprinkles
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Gabe Scholz
@@ -87,7 +87,6 @@ files:
 - lib/angular_sprinkles/directive/input.rb
 - lib/angular_sprinkles/directive/name.rb
 - lib/angular_sprinkles/engine.rb
-- lib/angular_sprinkles/form_binder.rb
 - lib/angular_sprinkles/form_binder/base.rb
 - lib/angular_sprinkles/form_binder/check_box.rb
 - lib/angular_sprinkles/form_binder/default.rb
@@ -112,6 +111,9 @@ files:
 - spec/angular_sprinkles/directive/html_spec.rb
 - spec/angular_sprinkles/directive/input_spec.rb
 - spec/angular_sprinkles/directive/name_spec.rb
+- spec/angular_sprinkles/form_binder/base_spec.rb
+- spec/angular_sprinkles/form_binder/check_box_spec.rb
+- spec/angular_sprinkles/form_binder/default_spec.rb
 - spec/angular_sprinkles/key_generator_spec.rb
 - spec/angular_sprinkles/model_decorator_spec.rb
 - spec/angular_sprinkles/object_key_wrapper_spec.rb

data/lib/angular_sprinkles/form_binder.rb

@@ -1,14 +0,0 @@
-module AngularSprinkles
-  class FormBinder
-    def self.new(args)
-      helper = args.fetch(:helper)
-
-      case helper
-      when :check_box
-        CheckBox.new(args)
-      else
-        Default.new(args)
-      end
-    end
-  end
-end