lanes 0.0.8 → 0.1.0

data/spec/lanes/{data/ModelSpec.coffee → models/BaseSpec.coffee}

@@ -1,17 +1,17 @@
 
-describe "Model Suite", ->
+describe "Base Model Suite", ->
     Model = undefined
     Collection = undefined
     class Color
         constructor: -> super
         props: { id: 'integer', rgb: 'string' }
-    Lanes.Data.Model.extend(Color)
+    Lanes.Models.Base.extend(Color)
 
     makeModel = (props,args={})->
         _.extend(Model.prototype, props)
-        Lanes.Data.Model.extend(Model)
+        Lanes.Models.Base.extend(Model)
         Collection::model = Model
-        Lanes.Data.Collection.extend(Collection)
+        Lanes.Models.Collection.extend(Collection)
         collection = new Collection
         return collection.add(new Model(args))
 
@@ -35,7 +35,7 @@ describe "Model Suite", ->
         expect(model.isDirty()).toBeFalse()
         model.foo = 'baz' # session prop
         expect(model.isDirty()).toBeFalse()
-        expect(model.unsavedData()).toBeEmptyObject()
+        expect(model.unsavedModels()).toBeEmptyObject()
         model.set( saved: 'true' )
         expect(model.isDirty()).toBeTrue()
 
@@ -83,7 +83,7 @@ describe "Model Suite", ->
                 
         }, { foo: 'one, two, three'} )
         expect(model.isDirty()).toBeTrue()
-        expect(model.unsavedData()).toEqual( foo: 'one, two, three' )
+        expect(model.unsavedModels()).toEqual( foo: 'one, two, three' )
         model.save()
         expect(model.sync).toHaveBeenCalledWith('create', model, jasmine.any(Object))
         model.id=11
@@ -111,6 +111,23 @@ describe "Model Suite", ->
         expect(options).toHaveTrue('ignoreUnsaved')
         expect(options).toHaveNumberWithinRange('limit',1,1)
 
+    it "creates a Collection property", ->
+        model = makeModel({})
+        expect(Model.Collection::model).toEqual(Model)
+    
+    it "loads using where", ->
+        model = makeModel({
+            props:
+                { id: 'integer', title: 'string' }
+        })
+        syncSucceedWith([
+            { id: 1, title: 'first value' }
+            { id: 2, title: 'second value' }
+        ])
+        collection = model.where(title: 'first value')
+        options = model.sync.lastOptions()
+        expect(options.query).toEqual({title:'first value'})
+        expect(collection.length).toEqual(2)
 
     it "can be destroyed", ->
         model = makeModel({
@@ -145,8 +162,3 @@ describe "Model Suite", ->
         expect(model.sync).toHaveBeenCalledWith('read', model, jasmine.any(Object))
         options = model.sync.lastOptions()
         expect(options.include).toEqual(['color'])
-        
-    it "assigns an inverse collection property", ->
-        model = makeModel({})
-        expect(Model::Collection).toEqual(Collection)
-    

data/spec/lanes/{data → models}/PubSubSpec.coffee

@@ -4,18 +4,18 @@ describe "PubSub Suite", ->
     it "checks in/out a model when it binds to a view", ->
         view  = new Lanes.Testing.View
         model = new Lanes.Testing.Model(id:1)
-        spyOn(Lanes.Data.PubSub,'add').and.callThrough()
-        spyOn(Lanes.Data.PubSub,'remove')
+        spyOn(Lanes.Models.PubSub,'add').and.callThrough()
+        spyOn(Lanes.Models.PubSub,'remove')
         view.model = model
-        expect(Lanes.Data.PubSub.add).toHaveBeenCalledWith(model)
+        expect(Lanes.Models.PubSub.add).toHaveBeenCalledWith(model)
         expect(Lanes.Vendor.MessageBus.subscribe)
             .toHaveBeenCalledWith("/test/1", jasmine.any(Function))
         view.unset('model')
-        expect(Lanes.Data.PubSub.remove).toHaveBeenCalledWith(model)
+        expect(Lanes.Models.PubSub.remove).toHaveBeenCalledWith(model)
 
     it "can retrieve a model after checkin", ->
         model = new Lanes.Testing.Model(id: 11, name:'bar')
-        Lanes.Data.PubSub.add(model)
-        checkin = Lanes.Data.PubSub.instanceFor(Lanes.Testing.Model, 11)
+        Lanes.Models.PubSub.add(model)
+        checkin = Lanes.Models.PubSub.instanceFor(Lanes.Testing.Model, 11)
         expect(checkin).toEqual(model)
         

data/views/specs.erb

@@ -5,18 +5,15 @@
         <meta http-equiv="X-UA-Compatible" content="IE=edge">
         <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no, minimal-ui"/>
         <title>Lanes Specs</title>
-
         <%=  javascript_tag 'lanes/workspace.js' %>
-
         <% specs.css_files.each do |css_file| %>
           <link rel="stylesheet" href="<%= css_file %>" type="text/css" media="screen"/>
         <% end %>
-
         <% specs.js_files.each do | js_file | %>
           <script src="<%= js_file %>" type="text/javascript"></script>
         <% end %>
         <script type="text/javascript">
-          Lanes.Data.Bootstrap.initialize( <%= client_bootstrap_data %> );
+          Lanes.Models.Bootstrap.initialize( <%= client_bootstrap_data %> );
         </script>
 
     </head>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lanes
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.1.0
 platform: ruby
 authors:
 - Nathan Stitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-20 00:00:00.000000000 Z
+date: 2014-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -502,18 +502,6 @@ files:
 - client/lanes/components/select_field/SelectField.coffee
 - client/lanes/components/select_field/index.js
 - client/lanes/components/select_field/select_field.scss
-- client/lanes/data/Bootstrap.coffee
-- client/lanes/data/ChangeSet.coffee
-- client/lanes/data/Collection.coffee
-- client/lanes/data/Config.coffee
-- client/lanes/data/Model.coffee
-- client/lanes/data/PubSub.coffee
-- client/lanes/data/Query.coffee
-- client/lanes/data/Screens.coffee
-- client/lanes/data/Sync.coffee
-- client/lanes/data/User.coffee
-- client/lanes/data/index.js
-- client/lanes/data/mixins/HasCodeField.coffee
 - client/lanes/extension/Base.coffee
 - client/lanes/extension/EarlyExtensions.js.erb
 - client/lanes/extension/Extensions.coffee
@@ -538,6 +526,18 @@ files:
 - client/lanes/lib/utilFunctions.coffee
 - client/lanes/minimal.js
 - client/lanes/minimal.scss.erb
+- client/lanes/models/Base.coffee
+- client/lanes/models/Bootstrap.coffee
+- client/lanes/models/ChangeSet.coffee
+- client/lanes/models/Collection.coffee
+- client/lanes/models/Config.coffee
+- client/lanes/models/PubSub.coffee
+- client/lanes/models/Query.coffee
+- client/lanes/models/Screens.coffee
+- client/lanes/models/Sync.coffee
+- client/lanes/models/User.coffee
+- client/lanes/models/index.js
+- client/lanes/models/mixins/HasCodeField.coffee
 - client/lanes/plugins/ResizeSensor.js
 - client/lanes/plugins/index.js
 - client/lanes/plugins/overlay.coffee
@@ -811,8 +811,8 @@ files:
 - lib/lanes/command/templates/client/Extension.coffee
 - lib/lanes/command/templates/client/components/.gitkeep
 - lib/lanes/command/templates/client/components/Component.coffee
-- lib/lanes/command/templates/client/data/Model.coffee
 - lib/lanes/command/templates/client/index.js
+- lib/lanes/command/templates/client/models/Model.coffee
 - lib/lanes/command/templates/client/screens/Screen.coffee
 - lib/lanes/command/templates/client/screens/index.js
 - lib/lanes/command/templates/client/screens/layout.html
@@ -834,7 +834,7 @@ files:
 - lib/lanes/command/templates/lib/namespace/version.rb
 - lib/lanes/command/templates/public/.gitkeep
 - lib/lanes/command/templates/spec/client/Screen.coffee
-- lib/lanes/command/templates/spec/client/data/ModelSpec.coffee
+- lib/lanes/command/templates/spec/client/models/ModelSpec.coffee
 - lib/lanes/command/templates/spec/client/views/ViewSpec.coffee
 - lib/lanes/command/templates/spec/fixtures/namespace/model.yml
 - lib/lanes/command/templates/spec/namespace/model_spec.rb
@@ -874,7 +874,6 @@ files:
 - lib/lanes/rails_engine.rb
 - lib/lanes/rake_tasks.rb
 - lib/lanes/screens.rb
-- lib/lanes/spec_asset_expander.rb
 - lib/lanes/spec_helper.rb
 - lib/lanes/strings.rb
 - lib/lanes/testing_models.rb
@@ -905,8 +904,8 @@ files:
 - spec/helpers/jasmine-jquery.js
 - spec/helpers/jasmine-matchers.js
 - spec/helpers/lanes-helpers.coffee
-- spec/lanes/data/ModelSpec.coffee
-- spec/lanes/data/PubSubSpec.coffee
+- spec/lanes/models/BaseSpec.coffee
+- spec/lanes/models/PubSubSpec.coffee
 - spec/lanes/views/BaseSpec.coffee
 - spec/numbers_spec.rb
 - spec/strings_spec.rb
@@ -927,7 +926,7 @@ files:
 - yard_ext/templates/default/method_details/setup.rb
 - yard_ext/validators.rb
 - yard_ext/visible_id_handler.rb
-homepage: http://argosity.com/lanes/
+homepage: http://lanesframework.org/
 licenses:
 - MIT
 metadata: {}

data/client/lanes/data/Bootstrap.coffee

@@ -1,8 +0,0 @@
-Lanes.Data.Bootstrap = {
-
-    initialize: (options)->
-        Lanes.Data.Config.csrf_token = options.csrf
-        Lanes.Data.Config.api_path  = options.api_path
-        Lanes.Extensions.setBootstrapData(options);
-
-}

data/client/lanes/data/Sync.coffee

@@ -1,63 +0,0 @@
-
-# a simple reimplentation
-# to use traffic cop
-methodMap = {
-    'create': 'POST',
-    'update': 'PUT',
-    'patch':  'PATCH',
-    'delete': 'DELETE',
-    'read':   'GET'
-}
-
-getValue = (object, prop)->
-    if !(object && object[prop])
-        return null;
-    return if _.isFunction(object[prop]) then object[prop]() else object[prop];
-
-
-urlError = ->
-    throw new Error('A "url" property or function must be specified')
-
-
-paramsMap = {
-    fields  : 'f'
-    with    : 'w'
-    query   : 'q'
-    include : 'i'
-    order   : 'o'
-    limit   : 'l'
-    start   : 's'
-    format  : 'df'
-}
-
-Lanes.Data.Sync = (method, model, options={})->
-
-    query = {}
-    for key, value of options
-        query[ paramsMap[key] ] = value if paramsMap[key]
-
-    # Default JSON-request options.
-    params = {
-        type: methodMap[method]
-        dataType: "json"
-        data: query
-    }
-
-    # Ensure that we have a URL.
-    params.url = _.result(model, "url") or urlError() unless options.url
-    params.url += '.json'
-    params.headers = {
-        X_CSRF_TOKEN: Lanes.Data.Config.csrf_token
-    }
-    params.contentType = "application/json"
-    if options.data || _.contains(['create','update','patch'], method)
-        params.data = JSON.stringify( options.data || model.dataForSave(options) )
-        delete options.data
-
-    # Don't process data on a non-GET request.
-    #params.processData = false if params.type isnt "GET"
-
-    # Make the request, allowing the user to override any Ajax options.
-    xhr = options.xhr = Lanes.$.ajax(_.extend(params, options))
-    model.trigger "request", model, xhr, options
-    xhr

data/lib/lanes/command/templates/spec/client/data/ModelSpec.coffee

@@ -1,5 +0,0 @@
-describe "<%= class_name %> Model Suite", ->
-
-    it "can be instantiated", ->
-        model = new Lanes.<%= namespace.camelize %>.Data.<%= class_name %>()
-        expect(model).toEqual(jasmine.any(Lanes.<%= namespace.camelize %>.Data.<%= class_name %>));

data/lib/lanes/spec_asset_expander.rb

@@ -1,43 +0,0 @@
-module Lanes
-    class SpecAssetExpander
-
-        def expand(src_dir, src_path)
-            pathname = src_path.gsub(/^\/?assets\//, '').gsub(/\.js$/, '')
-
-            asset_bundle.assets(pathname).flat_map { |asset|
-                "/#{asset.gsub(/^\//, '')}?body=true"
-            }
-        end
-
-        private
-
-        def asset_bundle
-            return AssetBundle.new
-        end
-
-        class AssetBundle
-            def assets(pathname)
-                context.get_original_assets(pathname)
-            end
-
-            private
-
-            def context
-                @context ||= ActionView::Base.new.extend(GetOriginalAssetsHelper)
-            end
-
-            module GetOriginalAssetsHelper
-                def get_original_assets(pathname)
-                    assets_environment.find_asset(pathname).to_a.map do |processed_asset|
-                        case processed_asset.content_type
-                        when "text/css"
-                            path_to_stylesheet(processed_asset.logical_path, debug: true)
-                        when "application/javascript"
-                            path_to_javascript(processed_asset.logical_path, debug: true)
-                        end
-                    end
-                end
-            end
-        end
-    end
-end