ember_serialize 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d074ed0b07539c6d5cd680795d55bf40fb6e7ff8
-  data.tar.gz: 5cee729773922c0e2834d1a9bf64658e1a8271e0
+  metadata.gz: a63e00e60fd0504935cc7d5d6295b3a063e09bf6
+  data.tar.gz: 0df2489b9ca6599caa25074e2b7e754d211e9931
 SHA512:
-  metadata.gz: 72932d3e1bc697ace1a10fdfdf28c740d723340a023cd566c858f76ef7204a54e96f44a06b49b4fcb863a9ab401016ad478fe8a5deec00e757d01caabd2964f6
-  data.tar.gz: 384010b62a3e9876f8a45608d53111e57cb247f71f6e1cc2644cfc95e59d0354930da48b3821b3500cd5ab881ba6b6b4ac28946ee979da1bbf57354fbd49dd48
+  metadata.gz: 7e79e24606521a5bf1348960d0fcff493a6c4d26916a0a82d69ebb2403b629ec1cf9f75afe39fc7d5cd43d0c010d662208fb18d2c59616ee5c364bbf039f22f9
+  data.tar.gz: f4f5abeb10131ee42b2f1478db29a0f73d669b6be5b746d46cfb853e2f3287e20eb1bdb40326130f9b53bfbc7d4811b3a29dfede6abc553911283788100a90b7

data/lib/ember_serialize/version.rb

@@ -1,3 +1,3 @@
 module EmberSerialize
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/ember_serialize.rb

@@ -45,8 +45,9 @@ module EmberSerialize
         if match
           next unless serializer.name =~ /^#{match}/
         end
-        schema = schema serializer
         model = model_class serializer
+        next unless model
+        schema = schema serializer
         ember_model_file = @models_dir + model.table_name.singularize + @extension
         new_content = ember_model_build(schema, model, ember_model_parse(ember_model_file, model))
         if new_content
@@ -228,7 +229,11 @@ MODEL
 
     def model_class(serializer)
       if serializer.respond_to? :model_class
-        return serializer.model_class
+        begin
+          return serializer.model_class
+        rescue NameError
+          return nil
+        end
       end
       @model_classes ||= Hash.new do |h,k|
         h[k] = k.name.gsub(/Serializer$/,'').constantize

data/test/dummy/app/serializers/application_serializer.rb

@@ -0,0 +1,3 @@
+class ApplicationSerializer < ActiveModel::Serializer
+  attributes :id
+end

data/test/dummy/app/serializers/comment_serializer.rb

@@ -1,4 +1,4 @@
-class CommentSerializer < ActiveModel::Serializer
+class CommentSerializer < ApplicationSerializer
   attributes :id, :title, :body, :post_id
   has_one :author, class_name: 'User'
 end

data/test/dummy/app/serializers/post_serializer.rb

@@ -1,4 +1,4 @@
-class PostSerializer < ActiveModel::Serializer
+class PostSerializer < ApplicationSerializer
   attributes :id, :title, :body
   has_one :author_dude, class_name: 'User'
   has_many :comments

data/test/dummy/app/serializers/user_serializer.rb

@@ -1,3 +1,3 @@
-class UserSerializer < ActiveModel::Serializer
+class UserSerializer < ApplicationSerializer
   attributes :id, :name
 end

data/test/dummy/log/test.log

@@ -12323,3 +12323,442 @@ EmberSerializeTest: test_serializes_match_parameter
 EmberSerializeTest: test_skips_or_creates_models
 ------------------------------------------------
    (0.2ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+-----------------------------------------------
+EmberSerializeTest: test_accepts_async_argument
+-----------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+------------------------------------------------
+EmberSerializeTest: test_accepts_engine_argument
+------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+---------------------------------
+EmberSerializeTest: test_app_name
+---------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+-------------------------------------
+EmberSerializeTest: test_builds_model
+-------------------------------------
+   (0.2ms)  rollback transaction
+   (0.1ms)  begin transaction
+--------------------------------------
+EmberSerializeTest: test_camelize_name
+--------------------------------------
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+------------------------------------
+EmberSerializeTest: test_ember_model
+------------------------------------
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+------------------------------------------------
+EmberSerializeTest: test_ember_reflect_attribute
+------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+-------------------------------------------------
+EmberSerializeTest: test_ember_reflect_belongs_to
+-------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+-----------------------------------------------
+EmberSerializeTest: test_ember_reflect_has_many
+-----------------------------------------------
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+----------------------------------
+EmberSerializeTest: test_existence
+----------------------------------
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+-----------------------------------
+EmberSerializeTest: test_initialize
+-----------------------------------
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+----------------------------------------------
+EmberSerializeTest: test_makes_model_directory
+----------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+----------------------------------------------
+EmberSerializeTest: test_parses_async_argument
+----------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+-------------------------------------
+EmberSerializeTest: test_parses_model
+-------------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+------------------------------------------------
+EmberSerializeTest: test_serialize_as_is_setting
+------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+-----------------------------------------------------
+EmberSerializeTest: test_serialize_finds_associations
+-----------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+-------------------------------------------------
+EmberSerializeTest: test_serialize_finds_existing
+-------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+-------------------------------------------------
+EmberSerializeTest: test_serialize_ignore_setting
+-------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+--------------------------------------------------
+EmberSerializeTest: test_serialize_ignores_outside
+--------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+---------------------------------------------------
+EmberSerializeTest: test_serializes_match_parameter
+---------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+------------------------------------------------
+EmberSerializeTest: test_skips_or_creates_models
+------------------------------------------------
+   (0.1ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+-----------------------------------------------
+EmberSerializeTest: test_accepts_async_argument
+-----------------------------------------------
+   (0.2ms)  rollback transaction
+   (0.1ms)  begin transaction
+------------------------------------------------
+EmberSerializeTest: test_accepts_engine_argument
+------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+---------------------------------
+EmberSerializeTest: test_app_name
+---------------------------------
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+-------------------------------------
+EmberSerializeTest: test_builds_model
+-------------------------------------
+   (0.2ms)  rollback transaction
+   (0.1ms)  begin transaction
+--------------------------------------
+EmberSerializeTest: test_camelize_name
+--------------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+--------------------------------------------------------------------------
+EmberSerializeTest: test_does_not_throw_NameError_on_ApplicationSerializer
+--------------------------------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+------------------------------------
+EmberSerializeTest: test_ember_model
+------------------------------------
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+------------------------------------------------
+EmberSerializeTest: test_ember_reflect_attribute
+------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+-------------------------------------------------
+EmberSerializeTest: test_ember_reflect_belongs_to
+-------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+-----------------------------------------------
+EmberSerializeTest: test_ember_reflect_has_many
+-----------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+----------------------------------
+EmberSerializeTest: test_existence
+----------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+-----------------------------------
+EmberSerializeTest: test_initialize
+-----------------------------------
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+----------------------------------------------
+EmberSerializeTest: test_makes_model_directory
+----------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+----------------------------------------------
+EmberSerializeTest: test_parses_async_argument
+----------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+-------------------------------------
+EmberSerializeTest: test_parses_model
+-------------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+------------------------------------------------
+EmberSerializeTest: test_serialize_as_is_setting
+------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+-----------------------------------------------------
+EmberSerializeTest: test_serialize_finds_associations
+-----------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+-------------------------------------------------
+EmberSerializeTest: test_serialize_finds_existing
+-------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+-------------------------------------------------
+EmberSerializeTest: test_serialize_ignore_setting
+-------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+--------------------------------------------------
+EmberSerializeTest: test_serialize_ignores_outside
+--------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+---------------------------------------------------
+EmberSerializeTest: test_serializes_match_parameter
+---------------------------------------------------
+   (0.3ms)  rollback transaction
+   (0.1ms)  begin transaction
+------------------------------------------------
+EmberSerializeTest: test_skips_or_creates_models
+------------------------------------------------
+   (0.1ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+-----------------------------------------------
+EmberSerializeTest: test_accepts_async_argument
+-----------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+------------------------------------------------
+EmberSerializeTest: test_accepts_engine_argument
+------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+---------------------------------
+EmberSerializeTest: test_app_name
+---------------------------------
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+-------------------------------------
+EmberSerializeTest: test_builds_model
+-------------------------------------
+   (0.1ms)  rollback transaction
+   (0.2ms)  begin transaction
+--------------------------------------
+EmberSerializeTest: test_camelize_name
+--------------------------------------
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+--------------------------------------------------------------------------
+EmberSerializeTest: test_does_not_throw_NameError_on_ApplicationSerializer
+--------------------------------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+------------------------------------
+EmberSerializeTest: test_ember_model
+------------------------------------
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+------------------------------------------------
+EmberSerializeTest: test_ember_reflect_attribute
+------------------------------------------------
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+-------------------------------------------------
+EmberSerializeTest: test_ember_reflect_belongs_to
+-------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+-----------------------------------------------
+EmberSerializeTest: test_ember_reflect_has_many
+-----------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+----------------------------------
+EmberSerializeTest: test_existence
+----------------------------------
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+-----------------------------------
+EmberSerializeTest: test_initialize
+-----------------------------------
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+----------------------------------------------
+EmberSerializeTest: test_makes_model_directory
+----------------------------------------------
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+----------------------------------------------
+EmberSerializeTest: test_parses_async_argument
+----------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+-------------------------------------
+EmberSerializeTest: test_parses_model
+-------------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+------------------------------------------------
+EmberSerializeTest: test_serialize_as_is_setting
+------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+-----------------------------------------------------
+EmberSerializeTest: test_serialize_finds_associations
+-----------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+-------------------------------------------------
+EmberSerializeTest: test_serialize_finds_existing
+-------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+-------------------------------------------------
+EmberSerializeTest: test_serialize_ignore_setting
+-------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+--------------------------------------------------
+EmberSerializeTest: test_serialize_ignores_outside
+--------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+---------------------------------------------------
+EmberSerializeTest: test_serializes_match_parameter
+---------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+------------------------------------------------
+EmberSerializeTest: test_skips_or_creates_models
+------------------------------------------------
+   (0.1ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+-----------------------------------------------
+EmberSerializeTest: test_accepts_async_argument
+-----------------------------------------------
+   (0.2ms)  rollback transaction
+   (0.1ms)  begin transaction
+------------------------------------------------
+EmberSerializeTest: test_accepts_engine_argument
+------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+---------------------------------
+EmberSerializeTest: test_app_name
+---------------------------------
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+-------------------------------------
+EmberSerializeTest: test_builds_model
+-------------------------------------
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+--------------------------------------
+EmberSerializeTest: test_camelize_name
+--------------------------------------
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+--------------------------------------------------------------------------
+EmberSerializeTest: test_does_not_throw_NameError_on_ApplicationSerializer
+--------------------------------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+------------------------------------
+EmberSerializeTest: test_ember_model
+------------------------------------
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+------------------------------------------------
+EmberSerializeTest: test_ember_reflect_attribute
+------------------------------------------------
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+-------------------------------------------------
+EmberSerializeTest: test_ember_reflect_belongs_to
+-------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+-----------------------------------------------
+EmberSerializeTest: test_ember_reflect_has_many
+-----------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+----------------------------------
+EmberSerializeTest: test_existence
+----------------------------------
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+-----------------------------------
+EmberSerializeTest: test_initialize
+-----------------------------------
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+----------------------------------------------
+EmberSerializeTest: test_makes_model_directory
+----------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+----------------------------------------------
+EmberSerializeTest: test_parses_async_argument
+----------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+-------------------------------------
+EmberSerializeTest: test_parses_model
+-------------------------------------
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+------------------------------------------------
+EmberSerializeTest: test_serialize_as_is_setting
+------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+-----------------------------------------------------
+EmberSerializeTest: test_serialize_finds_associations
+-----------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+-------------------------------------------------
+EmberSerializeTest: test_serialize_finds_existing
+-------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+-------------------------------------------------
+EmberSerializeTest: test_serialize_ignore_setting
+-------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+--------------------------------------------------
+EmberSerializeTest: test_serialize_ignores_outside
+--------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+---------------------------------------------------
+EmberSerializeTest: test_serializes_match_parameter
+---------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+------------------------------------------------
+EmberSerializeTest: test_skips_or_creates_models
+------------------------------------------------
+   (0.1ms)  rollback transaction

data/test/ember_serialize_test.rb

@@ -127,7 +127,7 @@ WITHOUTEM
   end
 
   test "builds model" do
-    ams = ActiveModel::Serializer.descendants.sort_by(&:name)[1]
+    ams = ActiveModel::Serializer.descendants.sort_by(&:name)[2]
     args = [["# for more details see: http://emberjs.com/guides/models/defining-models/", "", "EmberSerialize.Post = DS.Model.extend", "  # ember_serialize:start", "  # ember_serialize:async false", "  id: DS.attr('integer'),", "  title: DS.attr('string'),", "  body: DS.attr('text'),", "  authorDude: DS.belongsTo('user'),", "  comments: DS.hasMany('comments')", "  # ember_serialize:end"], 3, 10, {"id"=>"  id: DS.attr('integer')", "title"=>"  title: DS.attr('string')", "body"=>"  body: DS.attr('text')", "authorDude"=>"  authorDude: DS.belongsTo('user')", "comments"=>"  comments: DS.hasMany('comments')"}, [], [], false, "  "]
     match = "# for more details see: http://emberjs.com/guides/models/defining-models/
 
@@ -207,6 +207,14 @@ EmberSerialize.Post = DS.Model.extend
     assert_match /async: true/, lines.grep(/authorDude:/).first, 'accepts async arg'
   end
 
+  test "does not throw NameError on ApplicationSerializer" do
+    revert_models
+    # this should pass on the ApplicationSerializer
+    assert_nothing_raised NameError do
+      @serializer.serialize
+    end
+  end
+
   test "parses async argument" do
     revert_models
     prep_model 'async_parse', 'post'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ember_serialize
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Noel Peden
@@ -131,6 +131,7 @@ files:
 - test/dummy/app/models/comment.rb
 - test/dummy/app/models/post.rb
 - test/dummy/app/models/user.rb
+- test/dummy/app/serializers/application_serializer.rb
 - test/dummy/app/serializers/comment_serializer.rb
 - test/dummy/app/serializers/post_serializer.rb
 - test/dummy/app/serializers/user_serializer.rb
@@ -220,6 +221,7 @@ test_files:
 - test/dummy/app/models/comment.rb
 - test/dummy/app/models/post.rb
 - test/dummy/app/models/user.rb
+- test/dummy/app/serializers/application_serializer.rb
 - test/dummy/app/serializers/comment_serializer.rb
 - test/dummy/app/serializers/post_serializer.rb
 - test/dummy/app/serializers/user_serializer.rb