angular_sprinkles 0.2.10 → 0.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff497a789844351965389703418e3b5cae9b1c0c
-  data.tar.gz: 4d438528165b334ccea8b9c847cdcc6cea92cd4a
+  metadata.gz: 68f766924279c886f5d635fe5de390204d62f2e7
+  data.tar.gz: de793ea045764fcbe4db8bff350386161247b514
 SHA512:
-  metadata.gz: c6d40cdf9eca41e89d92bc60a91b93996a207b3bb65f536991091c14453dd94ec506de92c4bfa3f5db005aee0700f94eb5898a8e0c6e0b56206a79c5ff6b4f7d
-  data.tar.gz: bb5d25e126014778a1219b391884df2865df8d8f4d0493938513587420aca99f0a1af6d44a4ce9b88558b5370b2d03d39c4cf394e70ec3aa2bd141d6862e5a6d
+  metadata.gz: cac41b688050c4b3054ef31a22d78dbfd008d063ea7524af5ba9b30abc3a22894787491722930efb2ad70ae1632ac0ed1d2e2d146da1fd92a5d4e86626986742
+  data.tar.gz: 16def7e9634067f93720d3dcc7660523a9440d59ace8e50cdc46d8f4e63f8a946675f34f751506bdce17f72ff3710bb096b802608c8e211da33a8307a4cd5e0f

data/VERSION

@@ -1 +1 @@
-0.2.10
+0.2.11

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.10 ruby lib
+# stub: angular_sprinkles 0.2.11 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "angular_sprinkles"
-  s.version = "0.2.10"
+  s.version = "0.2.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
@@ -36,6 +36,7 @@ Gem::Specification.new do |s|
     "lib/angular_sprinkles/context.rb",
     "lib/angular_sprinkles/counter.rb",
     "lib/angular_sprinkles/directive/attributes.rb",
+    "lib/angular_sprinkles/directive/controller.rb",
     "lib/angular_sprinkles/directive/html.rb",
     "lib/angular_sprinkles/directive/input.rb",
     "lib/angular_sprinkles/directive/name.rb",
@@ -62,6 +63,7 @@ Gem::Specification.new do |s|
     "spec/angular_sprinkles/context_spec.rb",
     "spec/angular_sprinkles/counter_spec.rb",
     "spec/angular_sprinkles/directive/attributes_spec.rb",
+    "spec/angular_sprinkles/directive/controller_spec.rb",
     "spec/angular_sprinkles/directive/html_spec.rb",
     "spec/angular_sprinkles/directive/input_spec.rb",
     "spec/angular_sprinkles/directive/name_spec.rb",

data/lib/angular_sprinkles/directive/controller.rb

@@ -0,0 +1,20 @@
+module AngularSprinkles
+  module Directive
+    class Controller
+      def initialize(args)
+        @name = args.fetch(:name)
+        @object_wrapper = args.fetch(:object_wrapper)
+        @bind_json_wrapper = args.fetch(:bind_json_wrapper)
+        @call_json_wrapper = args.fetch(:call_json_wrapper)
+      end
+
+      def bind(attribute = nil)
+        @object_wrapper.new(@name, attribute, @bind_json_wrapper)
+      end
+
+      def call(function, *input)
+        @object_wrapper.new(@name, function, input, @call_json_wrapper)
+      end
+    end
+  end
+end

data/lib/angular_sprinkles/helpers/directive_helper.rb

@@ -2,7 +2,16 @@ module AngularSprinkles
   module Helpers
     module DirectiveHelper
       def directive(directive_name, options = {}, &block)
-        content = capture(&block) if block_given?
+        if block_given?
+          controller = Directive::Controller.new({
+            name: "#{directive_name.to_s.camelize(:lower)}Ctrl",
+            object_wrapper: ObjectKeyWrapper,
+            bind_json_wrapper: JavaScript::NoOp,
+            call_json_wrapper: JavaScript::BindService
+          })
+
+          content = capture(controller, &block)
+        end
 
         name = Directive::Name.new(directive_name)
         input = Directive::Input.new(options.except(:html))

data/lib/angular_sprinkles/helpers/service_helper.rb

@@ -7,7 +7,7 @@ module AngularSprinkles
         register_service = ObjectKeyWrapper.new(camelized, JavaScript::RegisterService)
         @_sprinkles.content_yielder.call(register_service)
 
-        ObjectKeyWrapper.new(camelized, input, JavaScript::BindService)
+        ObjectKeyWrapper.new(camelized, input, JavaScript::BindRootService)
       end
     end
   end

data/lib/angular_sprinkles/java_script.rb

@@ -53,8 +53,12 @@ module AngularSprinkles
       "#{SERVICE_QUEUE}.push('#{method}')"
     end
 
-    BindService = ->(method, input) do
-      "#{CONTROLLER_NAME}.#{method}(#{input.join(',')})"
+    BindRootService = ->(*args) do
+      BindService.call(CONTROLLER_NAME, *args)
+    end
+
+    BindService = ->(controller_name, method, input) do
+      "#{controller_name}.#{method}(#{input.map(&:to_json).join(',')})"
     end
 
     RegisterVariable = ->(*args) do
@@ -71,11 +75,11 @@ module AngularSprinkles
     end
 
     BindVariable = ->(*args) do
-      [CONTROLLER_NAME, *args].flatten.compact.join('.')
+      NoOp.call(*[CONTROLLER_NAME, *args])
     end
 
     NoOp = ->(*args) do
-      args.join('.')
+      args.flatten.compact.join('.')
     end
   end
 end

data/lib/angular_sprinkles.rb

@@ -3,6 +3,7 @@ require "angular_sprinkles/constructor"
 require "angular_sprinkles/constructor_collection"
 require "angular_sprinkles/content_yielder"
 require "angular_sprinkles/directive/attributes"
+require "angular_sprinkles/directive/controller"
 require "angular_sprinkles/directive/input"
 require "angular_sprinkles/directive/name"
 require "angular_sprinkles/directive/html"

data/spec/angular_sprinkles/directive/controller_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper'
+
+describe AngularSprinkles::Directive::Controller do
+  let(:name) { double }
+  let(:object_wrapper) { double }
+  let(:bind_json_wrapper) { double }
+  let(:call_json_wrapper) { double }
+
+  subject do
+    described_class.new({
+      name: name,
+      object_wrapper: object_wrapper,
+      bind_json_wrapper: bind_json_wrapper,
+      call_json_wrapper: call_json_wrapper
+    })
+  end
+
+  describe "#bind" do
+    it "wraps the controller name" do
+      attribute = double
+
+      expect(object_wrapper).to receive(:new).with(name, attribute, bind_json_wrapper)
+      subject.bind(attribute)
+
+      expect(object_wrapper).to receive(:new).with(name, nil, bind_json_wrapper)
+      subject.bind
+    end
+  end
+
+  describe "#call" do
+    it "wraps the controller name" do
+      function = double
+      input = [double, double]
+
+      expect(object_wrapper).to receive(:new).with(name, function, input, call_json_wrapper)
+      subject.call(function, *input)
+    end
+  end
+end

data/spec/angular_sprinkles/model_decorator_spec.rb

@@ -12,7 +12,7 @@ describe AngularSprinkles::ModelDecorator do
   end
 
   describe "#bind" do
-    it 'returns a binding object' do
+    it "returns a binding object" do
       expect(object_wrapper).to receive(:new).with(key, attribute, json_wrapper)
       subject.bind(attribute)
 
@@ -21,4 +21,10 @@ describe AngularSprinkles::ModelDecorator do
     end
   end
 
+  describe "#class" do
+    it "delegates to the wrapped object" do
+      expect(subject.class).to eq(object.class)
+    end
+  end
+
 end

data/spec/dummy/app/assets/javascripts/application.js

@@ -25,6 +25,20 @@ sprinkles.service('formSubmitted', function () {
   };
 });
 
+sprinkles.directive('bigHelloWorld', function () {
+  return {
+    scope: true,
+    controllerAs: 'bigHelloWorldCtrl',
+    controller: function () {
+      this.attribute = 'bigHelloWorldCtrlAttribute';
+
+      this.func = function (name) {
+        return name;
+      };
+    }
+  }
+});
+
 sprinkles.directive('nestedDirective', function () {
   return {
     scope: {

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

@@ -2,7 +2,10 @@
 <div id="bind-service-div" ng-bind="<%= service(:hello_world, @model.bind(:name)) %>"></div>
 <div id="bind-div" ng-bind="<%= bind(:hello, :world) %>"></div>
 
-<%= directive(:big_hello_world, html: { id: "directive-div" }) do %>
+<%= directive(:big_hello_world, html: { id: "directive-div" }) do |ctrl| %>
+  <div id="directive-ctrl-bind" ng-bind="<%= ctrl.bind(:attribute) %>"></div>
+  <div id="directive-ctrl-call" ng-bind="<%= ctrl.call(:func, 'func result') %>"></div>
+
   <%= directive(:nested_directive, name: @model.bind(:name), html: { tag: 'h1' }) %>
 <% end %>
 

data/spec/features/javascript_bindings_spec.rb

@@ -17,7 +17,6 @@ feature "javascript_bindings", js: true do
     # this element starts out empty
     expect { find("#bind-div") }.to raise_error
 
-
     fill_in("Input", with: new_name)
     expect(find("#data-binding-div")).to have_content(new_name)
     expect(find("#bind-service-div")).to have_content("Hello #{new_name}")
@@ -25,5 +24,9 @@ feature "javascript_bindings", js: true do
 
     fill_in("Bind", with: new_name)
     expect(find("#bind-div")).to have_content(new_name)
+
+    # directive controller results
+    expect(find("#directive-ctrl-bind")).to have_content("bigHelloWorldCtrlAttribute")
+    expect(find("#directive-ctrl-call")).to have_content('func result')
   end
 end

data/spec/spec_helper.rb

@@ -1,9 +1,7 @@
 if ENV["COVERALLS_REPO_TOKEN"]
   require "coveralls"
   Coveralls.wear! do
-    add_filter 'dummy'
-    add_filter 'rails_helper.rb'
-    add_filter 'spec_helper.rb'
+    add_filter 'spec'
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: angular_sprinkles
 version: !ruby/object:Gem::Version
-  version: 0.2.10
+  version: 0.2.11
 platform: ruby
 authors:
 - Gabe Scholz
@@ -83,6 +83,7 @@ files:
 - lib/angular_sprinkles/context.rb
 - lib/angular_sprinkles/counter.rb
 - lib/angular_sprinkles/directive/attributes.rb
+- lib/angular_sprinkles/directive/controller.rb
 - lib/angular_sprinkles/directive/html.rb
 - lib/angular_sprinkles/directive/input.rb
 - lib/angular_sprinkles/directive/name.rb
@@ -109,6 +110,7 @@ files:
 - spec/angular_sprinkles/context_spec.rb
 - spec/angular_sprinkles/counter_spec.rb
 - spec/angular_sprinkles/directive/attributes_spec.rb
+- spec/angular_sprinkles/directive/controller_spec.rb
 - spec/angular_sprinkles/directive/html_spec.rb
 - spec/angular_sprinkles/directive/input_spec.rb
 - spec/angular_sprinkles/directive/name_spec.rb