angular_sprinkles 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04613ad621c5fa4d0bbae54eb75509fee2c95d1f
-  data.tar.gz: 47b85137b16c7dcebcad026d3c04a1d403d3b59d
+  metadata.gz: 5b64d257dda0cf1e8a99f220b37cd4038d4cf8cf
+  data.tar.gz: 4a6c9bc4529978427aff6c3b4ba8e14b997bd7fd
 SHA512:
-  metadata.gz: ce0ee1de35c5ace45a90ec6b66edc1b1571a0777e7a04e1826604e7fd2bedaab722a7ed6b26a47185b61e7eaafad781477addcd68c9505b6e5af2a99a9f8024d
-  data.tar.gz: e8e92bcd7ea5c0fbd03c54b9cd8e1bacb1464ce35fa6edb4e7d77beb337ae08370e0dd5b3bce14d09e9c29178bf31e218bbee99f344881101477e90fa40c92d5
+  metadata.gz: d198024dbbfba69d739051c5df36717df41a62eab9792b794da9dfcdad20b35557e2fcf809ec9d4832c3c44b361a43e789cd56d4fc65cdcbf83483abd557e264
+  data.tar.gz: 2159d526dde0559420cf6144e025b1fbaa5b2a057156153d11dafa507d833bc21ce030a76d9d26dc40900550e3ab3027b791c1c773906e6dbd6e7013882d00a4

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/angular_sprinkles.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: angular_sprinkles 0.1.1 ruby lib
+# stub: angular_sprinkles 0.2.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "angular_sprinkles"
-  s.version = "0.1.1"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Gabe Scholz"]
-  s.date = "2014-10-03"
+  s.date = "2014-10-10"
   s.description = "Add a few sprinkles of AngularJS to your Rails App"
   s.email = "gabe@brewhouse.io"
   s.extra_rdoc_files = [
@@ -34,19 +34,24 @@ Gem::Specification.new do |s|
     "lib/angular_sprinkles/content_cache.rb",
     "lib/angular_sprinkles/content_yielder.rb",
     "lib/angular_sprinkles/context.rb",
-    "lib/angular_sprinkles/controller.rb",
     "lib/angular_sprinkles/counter.rb",
     "lib/angular_sprinkles/directive/attributes.rb",
     "lib/angular_sprinkles/directive/html.rb",
     "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",
     "lib/angular_sprinkles/helpers.rb",
     "lib/angular_sprinkles/helpers/bind_helper.rb",
     "lib/angular_sprinkles/helpers/directive_helper.rb",
     "lib/angular_sprinkles/helpers/service_helper.rb",
     "lib/angular_sprinkles/java_script.rb",
     "lib/angular_sprinkles/key_generator.rb",
+    "lib/angular_sprinkles/mixins/controller.rb",
+    "lib/angular_sprinkles/mixins/form_builder.rb",
     "lib/angular_sprinkles/model_decorator.rb",
     "lib/angular_sprinkles/object_key_wrapper.rb",
     "lib/angular_sprinkles/railtie.rb",
@@ -79,7 +84,8 @@ Gem::Specification.new do |s|
     "spec/dummy/app/models/concerns/.keep",
     "spec/dummy/app/models/test_model.rb",
     "spec/dummy/app/views/layouts/application.html.erb",
-    "spec/dummy/app/views/test/new.html.erb",
+    "spec/dummy/app/views/test/form_helpers.html.erb",
+    "spec/dummy/app/views/test/javascript_bindings.html.erb",
     "spec/dummy/bin/bundle",
     "spec/dummy/bin/rails",
     "spec/dummy/bin/rake",
@@ -110,7 +116,8 @@ Gem::Specification.new do |s|
     "spec/dummy/public/422.html",
     "spec/dummy/public/500.html",
     "spec/dummy/public/favicon.ico",
-    "spec/features/javascript_spec.rb",
+    "spec/features/form_helpers_spec.rb",
+    "spec/features/javascript_bindings_spec.rb",
     "spec/rails_helper.rb",
     "spec/spec_helper.rb"
   ]

data/lib/angular_sprinkles.rb

@@ -7,15 +7,23 @@ require "angular_sprinkles/directive/input"
 require "angular_sprinkles/directive/name"
 require "angular_sprinkles/directive/html"
 require "angular_sprinkles/context"
-require "angular_sprinkles/controller"
 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"
 require "angular_sprinkles/helpers/bind_helper"
 require "angular_sprinkles/helpers/directive_helper"
 require "angular_sprinkles/helpers/service_helper"
 require "angular_sprinkles/helpers"
 require "angular_sprinkles/java_script"
 require "angular_sprinkles/key_generator"
+require "angular_sprinkles/mixins/controller"
+require "angular_sprinkles/mixins/form_builder"
 require "angular_sprinkles/model_decorator"
 require "angular_sprinkles/object_key_wrapper"
 require "angular_sprinkles/railtie"
+
+ActionController::Base.send(:include, AngularSprinkles::Mixins::Controller)
+ActionView::Helpers::FormBuilder.send(:include, AngularSprinkles::Mixins::FormBuilder)

data/lib/angular_sprinkles/form_binder.rb

@@ -0,0 +1,14 @@
+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

data/lib/angular_sprinkles/form_binder/base.rb

@@ -0,0 +1,34 @@
+module AngularSprinkles
+  class FormBinder
+    class Base
+      def initialize(_args)
+        @method = _args.fetch(:method)
+        @args = _args.fetch(:args).dup
+
+        object = _args.fetch(:object)
+        attribute = @args.first.to_sym
+
+        @attribute_binding = object.bind(attribute)
+      end
+
+      def call
+        # Let the original form helper raise the exception
+        return @args if helper_is_going_raise_argument_error?
+
+        args_with_binding
+      end
+
+      private
+
+      def args_with_binding; raise NotImplementedError; end
+
+      def helper_is_going_raise_argument_error?
+        @args.count < required_parameters.count
+      end
+
+      def required_parameters
+        @method.parameters.select { |i| i.first == :req }
+      end
+    end
+  end
+end

data/lib/angular_sprinkles/form_binder/check_box.rb

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

data/lib/angular_sprinkles/form_binder/default.rb

@@ -0,0 +1,20 @@
+module AngularSprinkles
+  class FormBinder
+    class Default < Base
+      private
+
+      def args_with_binding
+        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({}) }
+
+          # The last argument is always the one where ng-model should be appended
+          args.last.reverse_merge!(binding)
+        end
+      end
+    end
+  end
+end

data/lib/angular_sprinkles/mixins/controller.rb

@@ -0,0 +1,52 @@
+module AngularSprinkles
+  module Mixins
+    module Controller
+      def initialize(*args)
+        counter = Counter.new
+        key_generator = KeyGenerator.new(counter: counter)
+
+        constructor_collection = ConstructorCollection.new({
+          json_wrapper: JavaScript::ConstructorThis,
+          object_wrapper: ObjectKeyWrapper
+        })
+
+        constructor = Constructor.new({
+          json_wrapper: JavaScript::ConstructorWrapper,
+          collection: constructor_collection
+        })
+
+        @_sprinkles = Context.new({
+          key_generator: key_generator,
+          constructor: constructor,
+          constructor_collection: constructor_collection
+        })
+
+        super
+      end
+
+      def bindable(object)
+        object = object.to_a if object.is_a?(::ActiveRecord::Relation)
+        object.map!(&method(:bindable)) if object.is_a?(Array)
+        key = @_sprinkles.key_generator.call(object)
+        @_sprinkles.constructor_collection.push(object, key)
+        ModelDecorator.new({
+          object: object,
+          key: key,
+          json_wrapper: JavaScript::BindVariable,
+          object_wrapper: ObjectKeyWrapper
+        })
+      end
+
+      def view_context
+        super.tap do |context|
+          @_sprinkles.content_yielder = ContentYielder.new({
+            cache: ContentCache.new,
+            context: context,
+            yield_to: JavaScript::PREFIX
+          })
+          @_sprinkles.content_yielder.call(@_sprinkles.constructor)
+        end
+      end
+    end
+  end
+end

data/lib/angular_sprinkles/mixins/form_builder.rb

@@ -0,0 +1,20 @@
+module AngularSprinkles
+  module Mixins
+    DEFAULT_HELPERS = ActionView::Helpers::FormBuilder.field_helpers - [:label, :fields_for]
+    # 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]
+
+    module FormBuilder
+      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
+            #{helper}(*args_with_binding, &block)
+          end
+        RUBY_EVAL
+      end
+    end
+  end
+end

data/spec/controllers/test_controller_spec.rb

@@ -5,7 +5,7 @@ describe TestController do
 
   let(:name) { "name" }
 
-  subject { get :new, { name: name }}
+  subject { get :javascript_bindings, { name: name }}
 
   it "renders the view with the correct bindings" do
     model_name = "TestModel_1"

data/spec/dummy/app/controllers/test_controller.rb

@@ -1,5 +1,10 @@
 class TestController < ApplicationController
-  def new
+  before_filter :set_model
+
+  def javascript_bindings; end
+  def form_helpers; end
+
+  def set_model
     @model = bindable(TestModel.new(name: params[:name]))
   end
 end

data/spec/dummy/app/views/test/form_helpers.html.erb

@@ -0,0 +1,26 @@
+<%= form_for @model, url: '' do |f| %>
+  <%# working 100%! %>
+    <% [:text_field, :password_field, :hidden_field, :file_field, :text_area,
+      :check_box, :color_field, :search_field, :telephone_field,
+      :phone_field, :date_field, :time_field, :datetime_field, :datetime_local_field,
+      :month_field, :week_field, :url_field, :email_field, :number_field, :range_field].each do |helper| %>
+
+      <%= f.send("bind_#{helper}", :name) %>
+    <% end %>
+
+    <%= f.bind_radio_button :name, :cool %>
+
+  <%# still need to check [:collection_check_boxes, :collection_radio_buttons] %>
+
+  <%# bind method works, but binding not correctly hooking up %>
+    <%# <%= f.bind_select :name %1> %>
+    <%# <%= f.bind_date_select :name %1> %>
+    <%# <%= f.bind_time_select :name %1> %>
+    <%# <%= f.bind_datetime_select :name %1> %>
+    <%# <%= f.bind_time_zone_select :name, nil, include_blank: true %1> %>
+
+  <%# doesn't work at all %>
+    <%# <%= f.bind_collection_select :name, :id, [], :id, :name %1> %>
+    <%# <%= f.bind_grouped_collection_select :name %1> %>
+
+<% end %>

data/spec/dummy/app/views/test/{new.html.erb → javascript_bindings.html.erb}

@@ -15,10 +15,3 @@
   <label for="bind">Bind</label>
   <input id="bind" name="bind" type="text" ng-model="<%= bind(:hello, :world) %>" />
 </div>
-
-<%# Rails bug with form_for and simple delegator. %>
-<%# Add this here to test the work around. %>
-<%= form_for @model, url: '' do |f| %>
-  <%= f.label :name %>
-  <%= f.text_field :name %>
-<% end %>

data/spec/dummy/config/routes.rb

@@ -1,5 +1,8 @@
 Rails.application.routes.draw do
-  root 'test#new'
+  root 'test#javascript_bindings'
+
+  get 'javascript_bindings', to: 'test#javascript_bindings'
+  get 'form_helpers', to: 'test#form_helpers'
   # The priority is based upon order of creation: first created -> highest priority.
   # See how all your routes lay out with "rake routes".
 

data/spec/features/form_helpers_spec.rb

@@ -0,0 +1,15 @@
+require "rails_helper"
+
+# javascript specs are slow, so test everything at
+# once on a single page
+
+feature "form_helpers", js: true do
+  let(:name) { 'name' }
+  let(:new_name) { 'namenamename?' }
+
+  it 'renders all of the helpers with ng-model' do
+    expect {
+      visit form_helpers_path(name: name)
+    }.not_to raise_error
+  end
+end

data/spec/features/{javascript_spec.rb → javascript_bindings_spec.rb}

@@ -3,12 +3,12 @@ require "rails_helper"
 # javascript specs are slow, so test everything at
 # once on a single page
 
-feature "javascript", js: true do
+feature "javascript_bindings", js: true do
   let(:name) { 'name' }
   let(:new_name) { 'namenamename?' }
 
   before do
-    visit root_path(name: name)
+    visit javascript_bindings_path(name: name)
   end
 
   it "should test all the things" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: angular_sprinkles
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Gabe Scholz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-03 00:00:00.000000000 Z
+date: 2014-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -81,19 +81,24 @@ files:
 - lib/angular_sprinkles/content_cache.rb
 - lib/angular_sprinkles/content_yielder.rb
 - lib/angular_sprinkles/context.rb
-- lib/angular_sprinkles/controller.rb
 - lib/angular_sprinkles/counter.rb
 - lib/angular_sprinkles/directive/attributes.rb
 - lib/angular_sprinkles/directive/html.rb
 - 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
 - lib/angular_sprinkles/helpers.rb
 - lib/angular_sprinkles/helpers/bind_helper.rb
 - lib/angular_sprinkles/helpers/directive_helper.rb
 - lib/angular_sprinkles/helpers/service_helper.rb
 - lib/angular_sprinkles/java_script.rb
 - lib/angular_sprinkles/key_generator.rb
+- lib/angular_sprinkles/mixins/controller.rb
+- lib/angular_sprinkles/mixins/form_builder.rb
 - lib/angular_sprinkles/model_decorator.rb
 - lib/angular_sprinkles/object_key_wrapper.rb
 - lib/angular_sprinkles/railtie.rb
@@ -126,7 +131,8 @@ files:
 - spec/dummy/app/models/concerns/.keep
 - spec/dummy/app/models/test_model.rb
 - spec/dummy/app/views/layouts/application.html.erb
-- spec/dummy/app/views/test/new.html.erb
+- spec/dummy/app/views/test/form_helpers.html.erb
+- spec/dummy/app/views/test/javascript_bindings.html.erb
 - spec/dummy/bin/bundle
 - spec/dummy/bin/rails
 - spec/dummy/bin/rake
@@ -157,7 +163,8 @@ files:
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
-- spec/features/javascript_spec.rb
+- spec/features/form_helpers_spec.rb
+- spec/features/javascript_bindings_spec.rb
 - spec/rails_helper.rb
 - spec/spec_helper.rb
 homepage: http://github.com/BrewhouseTeam/angular_sprinkles

data/lib/angular_sprinkles/controller.rb

@@ -1,52 +0,0 @@
-module AngularSprinkles
-  module Controller
-    def initialize(*args)
-      counter = Counter.new
-      key_generator = KeyGenerator.new(counter: counter)
-
-      constructor_collection = ConstructorCollection.new({
-        json_wrapper: JavaScript::ConstructorThis,
-        object_wrapper: ObjectKeyWrapper
-      })
-
-      constructor = Constructor.new({
-        json_wrapper: JavaScript::ConstructorWrapper,
-        collection: constructor_collection
-      })
-
-      @_sprinkles = Context.new({
-        key_generator: key_generator,
-        constructor: constructor,
-        constructor_collection: constructor_collection
-      })
-
-      super
-    end
-
-    def bindable(object)
-      object = object.to_a if object.is_a?(::ActiveRecord::Relation)
-      object.map!(&method(:bindable)) if object.is_a?(Array)
-      key = @_sprinkles.key_generator.call(object)
-      @_sprinkles.constructor_collection.push(object, key)
-      ModelDecorator.new({
-        object: object,
-        key: key,
-        json_wrapper: JavaScript::BindVariable,
-        object_wrapper: ObjectKeyWrapper
-      })
-    end
-
-    def view_context
-      super.tap do |context|
-        @_sprinkles.content_yielder = ContentYielder.new({
-          cache: ContentCache.new,
-          context: context,
-          yield_to: JavaScript::PREFIX
-        })
-        @_sprinkles.content_yielder.call(@_sprinkles.constructor)
-      end
-    end
-  end
-end
-
-ActionController::Base.send(:include, AngularSprinkles::Controller)