angular_sprinkles 0.0.9 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dafbcaba32994ad34dc1f4a823842cfbca68fbdc
-  data.tar.gz: c8b63cd4e09c91447ca816e4dc87ab8ed1653161
+  metadata.gz: 43af97b13d208a75928debe2dedf10426a0470a4
+  data.tar.gz: cb7babecbd9b850ba8d23c80d9580f64ee91bff8
 SHA512:
-  metadata.gz: d2713e0baf4e6969edf8c5d48916bebd8b91bf0d833fd91a6fe73fd7cd77c3bced85620cccabe5cae9ea3a618643980b62feef80801be40c93c43b0f92bbc53d
-  data.tar.gz: b9c31e8430583dee715be944325215a0f5906f01db398d7cb5814af23d829e1c89a2a03a00e1bc41aa58a9488e6cf017acb8f23a4eedab863360cba50876a8bc
+  metadata.gz: f47f112dacb01baf3afae724b08778257a4b2569a19b824589ce3b92f1ec78293792e7e5f18813e2fba79a19591f1ec556af76a16da808837f80a719bf20b63f
+  data.tar.gz: 0397bac1e5cb7337ff27a541fb01496e9a939b961c8236b05dac3bae7e1e4d52517566a7c0d592e434d1f08b26b1fc56801e6d2c2a997496afd005031b8d7942

data/Gemfile

@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
-gem "rails"
-gem "angularjs-rails"
+gem "rails", ">= 3", "< 5"
+gem "angularjs-rails", "~> 1"
 
 group :development do
   gem "jeweler"

data/Gemfile.lock

@@ -178,12 +178,12 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  angularjs-rails
+  angularjs-rails (~> 1)
   capybara
   coveralls
   jeweler
   launchy
-  rails
+  rails (>= 3, < 5)
   rspec-rails
   selenium-webdriver
   sqlite3

data/README.md

@@ -8,7 +8,7 @@ Angular Sprinkles is a gem for writing Rails-flavored AngularJS.
 
 - __No frontend setup required:__ By just requiring it in your project, Sprinkles dynamically generates an Angular application around your Rails templates. It's never been easier to start developing with Angular and Rails.
 - __Rails as it was intended to be written:__ Angular's two-way data binding, directives, and function calls are all done in the view via helper methods, giving you just a sprinkle of JavaScript.
-- __Forget about the SPA:__ If you're not using Rails an API, trying to build an SPA on top of it is a huge pain. Sprinkles allows you to continue to write Rails applications as you always have without all of the nasty jQuery spaghetti.
+- __A cleaner approach to JavaScript:__ Sprinkles allows you to continue to write Rails applications as you always have without all of the nasty jQuery spaghetti.
 
 ## Examples
 
@@ -56,11 +56,14 @@ sprinkles.service('alertMe', function () {
 <button ng-click="<%= service(:alert_me, "world") %>">Click me!</button>
 ```
 
+Also see the [demo application](https://github.com/BrewhouseTeam/angular_sprinkles_example) for more examples.
+
 ## Setup
 
 Add `angular_sprinkles` to your `Gemfile`.
 
 ```ruby
+gem 'angularjs-rails'
 gem 'angular_sprinkles'
 ```
 

data/VERSION

@@ -1 +1 @@
-0.0.9
+0.1.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.0.9 ruby lib
+# stub: angular_sprinkles 0.1.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "angular_sprinkles"
-  s.version = "0.0.9"
+  s.version = "0.1.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-09-13"
+  s.date = "2014-09-19"
   s.description = "Add a few sprinkles of AngularJS to your Rails App"
   s.email = "gabe@brewhouse.io"
   s.extra_rdoc_files = [
@@ -42,6 +42,7 @@ Gem::Specification.new do |s|
     "lib/angular_sprinkles/directive/name.rb",
     "lib/angular_sprinkles/engine.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",
@@ -122,17 +123,17 @@ Gem::Specification.new do |s|
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rails>, [">= 0"])
-      s.add_runtime_dependency(%q<angularjs-rails>, [">= 0"])
+      s.add_runtime_dependency(%q<rails>, ["< 5", ">= 3"])
+      s.add_runtime_dependency(%q<angularjs-rails>, ["~> 1"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
     else
-      s.add_dependency(%q<rails>, [">= 0"])
-      s.add_dependency(%q<angularjs-rails>, [">= 0"])
+      s.add_dependency(%q<rails>, ["< 5", ">= 3"])
+      s.add_dependency(%q<angularjs-rails>, ["~> 1"])
       s.add_dependency(%q<jeweler>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rails>, [">= 0"])
-    s.add_dependency(%q<angularjs-rails>, [">= 0"])
+    s.add_dependency(%q<rails>, ["< 5", ">= 3"])
+    s.add_dependency(%q<angularjs-rails>, ["~> 1"])
     s.add_dependency(%q<jeweler>, [">= 0"])
   end
 end

data/lib/angular_sprinkles.rb

@@ -10,6 +10,7 @@ require "angular_sprinkles/context"
 require "angular_sprinkles/controller"
 require "angular_sprinkles/counter"
 require "angular_sprinkles/engine"
+require "angular_sprinkles/helpers/bind_helper"
 require "angular_sprinkles/helpers/directive_helper"
 require "angular_sprinkles/helpers/service_helper"
 require "angular_sprinkles/helpers"

data/lib/angular_sprinkles/helpers.rb

@@ -1,6 +1,7 @@
 module AngularSprinkles
   module Helpers
-    include ServiceHelper
+    include BindHelper
     include DirectiveHelper
+    include ServiceHelper
   end
 end

data/lib/angular_sprinkles/helpers/bind_helper.rb

@@ -0,0 +1,14 @@
+module AngularSprinkles
+  module Helpers
+    module BindHelper
+      def bind(*input)
+        camelized = input.map(&:to_s).map { |i| i.camelize(:lower) }
+
+        register_service = ObjectKeyWrapper.new(*camelized, JavaScript::RegisterVariable)
+        @_sprinkles.content_yielder.call(register_service)
+
+        ObjectKeyWrapper.new(*camelized, JavaScript::BindVariable)
+      end
+    end
+  end
+end

data/lib/angular_sprinkles/helpers/service_helper.rb

@@ -1,8 +1,8 @@
 module AngularSprinkles
   module Helpers
     module ServiceHelper
-      def service(service, *input)
-        camelized = service.to_s.camelize(:lower)
+      def service(name, *input)
+        camelized = name.to_s.camelize(:lower)
 
         register_service = ObjectKeyWrapper.new(camelized, JavaScript::RegisterService)
         @_sprinkles.content_yielder.call(register_service)

data/lib/angular_sprinkles/java_script.rb

@@ -45,6 +45,10 @@ module AngularSprinkles
       "this.#{key} = #{object.to_json};"
     end
 
+    ControllerPrototypeVariable = ->(*args) do
+      "#{CONTROLLER_FN}.prototype.#{args.join('.')}"
+    end
+
     RegisterService = ->(method) do
       "#{SERVICE_QUEUE}.push('#{method}')"
     end
@@ -53,8 +57,21 @@ module AngularSprinkles
       "#{CONTROLLER_NAME}.#{method}(#{input.join(',')})"
     end
 
-    BindVariable = ->(key, attribute) do
-      [CONTROLLER_NAME, key, attribute].flatten.compact.join('.')
+    RegisterVariable = ->(*args) do
+      args.pop
+
+      acc, _ = args.inject(['', []]) do |(acc, store), arg|
+        store.push(arg)
+        prototype = ControllerPrototypeVariable.call(store)
+        acc += "#{prototype} = #{prototype} || {};\n"
+        [acc, store]
+      end
+
+      acc
+    end
+
+    BindVariable = ->(*args) do
+      [CONTROLLER_NAME, *args].flatten.compact.join('.')
     end
   end
 end

data/spec/angular_sprinkles/constructor_collection_spec.rb

@@ -2,13 +2,8 @@ require 'spec_helper'
 
 describe AngularSprinkles::ConstructorCollection do
   let(:json_wrapper) { ->{} }
-  let(:object_wrapper) { Object.new }
-
   let(:stub) { "stub" }
-
-  before do
-    allow(object_wrapper).to receive(:new).and_return(stub)
-  end
+  let(:object_wrapper) { double(new: stub) }
 
   subject { described_class.new(json_wrapper: json_wrapper, object_wrapper: object_wrapper) }
 

data/spec/angular_sprinkles/content_yielder_spec.rb

@@ -2,23 +2,15 @@ require 'spec_helper'
 
 describe AngularSprinkles::ContentYielder do
   let(:context) { ActionController::Base.new.view_context }
-  let(:cache) { Object.new }
   let(:yield_to) { :yield_to }
   let(:content) { 'content' }
 
   subject { described_class.new(context: context, cache: cache, yield_to: yield_to) }
 
-  before do
-    allow(cache).to receive(:set).and_return(true)
-  end
-
   context "when the content hasn't yet been set" do
+    let(:cache) { double(set: true, set?: false) }
     let(:script_tag) { "<script>#{content.to_json}</script>" }
 
-    before do
-      allow(cache).to receive(:set?).and_return(false)
-    end
-
     it 'returns a script tag' do
       expect(subject.call(content)).to eq(script_tag)
     end
@@ -33,9 +25,7 @@ describe AngularSprinkles::ContentYielder do
   end
 
   context "when the content has been set" do
-    before do
-      allow(cache).to receive(:set?).and_return(true)
-    end
+    let(:cache) { double(set: true, set?: true) }
 
     it 'returns an empty string' do
       expect(subject.call(content)).to eq('')

data/spec/angular_sprinkles/context_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
 describe AngularSprinkles::Context do
-  let(:key_generator) { Object.new }
-  let(:constructor) { Object.new }
-  let(:constructor_collection) { Object.new }
-  let(:view_context) { Object.new }
+  let(:key_generator) { double }
+  let(:constructor) { double }
+  let(:constructor_collection) { double }
+  let(:view_context) { double }
 
   subject do
     described_class.new({

data/spec/angular_sprinkles/directive/attributes_spec.rb

@@ -1,18 +1,13 @@
 require 'spec_helper'
 
 describe AngularSprinkles::Directive::Attributes do
-  let(:stub) { Object.new }
-
-  let(:name) { stub }
-  let(:input) { stub }
-  let(:options) { stub }
+  let(:something) { double(attributes: {}) }
+  let(:name) { something }
+  let(:input) { something }
+  let(:options) { something }
   let(:content) { 'content' }
   let(:tag) { :div }
 
-  before do
-    allow(stub).to receive(:attributes).and_return({})
-  end
-
   subject do
     described_class.new([name, input, options], content: content, tag: tag)
   end

data/spec/angular_sprinkles/key_generator_spec.rb

@@ -1,13 +1,9 @@
 require 'spec_helper'
 
 describe AngularSprinkles::KeyGenerator do
-  let(:counter) { Object.new }
+  let(:counter) { double(inc: inc) }
   let(:inc) { 1 }
-  let(:object) { Object.new }
-
-  before do
-    allow(counter).to receive(:inc).with(object.class).and_return(inc)
-  end
+  let(:object) { double }
 
   subject { described_class.new(counter: counter) }
 

data/spec/angular_sprinkles/model_decorator_spec.rb

@@ -2,10 +2,10 @@ require 'spec_helper'
 
 describe AngularSprinkles::ModelDecorator do
   let(:key) { 'key' }
-  let(:object) { Object.new }
+  let(:object) { double }
   let(:attribute) { :a }
   let(:json_wrapper) { ->(key, attribute) { "#{key}+#{attribute}"} }
-  let(:object_wrapper) { Array }
+  let(:object_wrapper) { double }
 
   subject do
     described_class.new(key: key, object: object, json_wrapper: json_wrapper, object_wrapper: object_wrapper)

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

@@ -1,9 +1,17 @@
 <div id="data-binding-div" ng-bind="<%= @model.bind(:name) %>"></div>
 <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(:nested_directive, name: @model.bind(:name), html: { tag: 'h1' }) %>
 <% end %>
 
-<label for="input">Input</label>
-<input id="input" name="input" type="text" ng-model="<%= @model.bind(:name) %>" />
+<div id="model-bind">
+  <label for="input">Input</label>
+  <input id="input" name="input" type="text" ng-model="<%= @model.bind(:name) %>" />
+</div>
+
+<div id="bind-bind">
+  <label for="bind">Bind</label>
+  <input id="bind" name="bind" type="text" ng-model="<%= bind(:hello, :world) %>" />
+</div>

data/spec/features/javascript_spec.rb

@@ -12,15 +12,21 @@ feature "javascript", js: true do
   end
 
   it "should test all the things" do
+    # these elements start with the @model binding
     expect(find("#data-binding-div")).to have_content(name)
     expect(find("#bind-service-div")).to have_content("Hello #{name}")
     expect(find("#directive-div h1 h2")).to have_content(name)
 
-    fill_in("Input", with: new_name)
+    # 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}")
-
     expect(find("#directive-div h1 h2")).to have_content(new_name)
+
+    fill_in("Bind", with: new_name)
+    expect(find("#bind-div")).to have_content(new_name)
   end
 end

metadata

@@ -1,43 +1,49 @@
 --- !ruby/object:Gem::Specification
 name: angular_sprinkles
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors:
 - Gabe Scholz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-13 00:00:00.000000000 Z
+date: 2014-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: angularjs-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
@@ -83,6 +89,7 @@ files:
 - lib/angular_sprinkles/directive/name.rb
 - lib/angular_sprinkles/engine.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