openstax_api 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b38439560a0b92bdaea0233f25c382459e9bdb6
-  data.tar.gz: 77da1ed44f1a29c8e8cb8e20749fd6e46ee959e3
+  metadata.gz: 0d1548c720a9fd4fdf2e54f8b005019e81504d99
+  data.tar.gz: 9bf3a7b1602fd86666e7db95df285cf55048b3c5
 SHA512:
-  metadata.gz: b7426278c69fa995d6f4efe96a7c490a719f8e6be3cd6828533aed799937d8a894933c306afb19915b695d45751b11849c00e5e7c6f2c616cd91c400d0c84753
-  data.tar.gz: a572244a0cec476924341f2f64ed6b9c5db5f3bea63d5fd6afe1d860bdfdc79040d50cc421b3834d2f09ae20dbb5800d0938ce93ba270031a6beeb49d836ab48
+  metadata.gz: 0b1d6867b462d6a264ea79a4c92db1e5a1bc250122fc2ab4c5b11497f52b96246caadb04ccc114022dafe05f93bddc3e7c0758014290ae44855bb07dc023b84a
+  data.tar.gz: 4acd371f45b872aa4a04cfd8ca44a0454052c8688f1db3fc4cbddab3a13ca475087dc9a29a7d0fbc14431cdc4ae48300812c9475a2e3678eb23b6bdb6ae79938

data/lib/openstax/api/representable_schema_printer.rb

@@ -23,7 +23,9 @@ module OpenStax
     protected
 
       def self.representer_name(representer)
-        representer.name.chomp('Representer').demodulize.camelize(:lower)
+        name = representer.name
+        return nil if name.nil?
+        name.chomp('Representer').demodulize.camelize(:lower)
       end
 
       def self.definition_name(name)
@@ -65,26 +67,27 @@ module OpenStax
           # Overwrite type for collections
           attr_info[:type] = 'array' if attr[:collection]
 
-          if attr[:use_decorator]
-            # Implicit representer - nest attributes
-            decorator = attr[:extend].evaluate(self)
-            attr_info.merge!(json_object(decorator, definitions, options))
-          elsif attr[:extend]
-            # Explicit representer - use reference
+          if attr[:extend]
+            # Nested representer
             decorator = attr[:extend].evaluate(self)
             rname = representer_name(decorator)
-            dname = definition_name(rname)
 
-            if attr[:collection]
-              attr_info[:items] = { :$ref => dname }
+            if rname
+              dname = definition_name(rname)
+
+              if attr[:collection]
+                attr_info[:items] = { :$ref => dname }
+              else
+                # Type is included in ref
+                attr_info.delete(:type)
+                attr_info[:$ref] = dname
+              end
+
+              definitions[rname] ||= json_object(decorator,
+                                                 definitions, options)
             else
-              # Type is included in ref
-              attr_info.delete(:type)
-              attr_info[:$ref] = dname
+              attr_info.merge!(json_object(decorator, definitions, options))
             end
-
-            definitions[rname] ||= json_object(decorator,
-                                               definitions, options)
           end
 
           schema[:properties][name.to_sym] = attr_info

data/lib/openstax/api/version.rb

@@ -1,5 +1,5 @@
 module OpenStax
   module Api
-    VERSION = "2.2.1"
+    VERSION = "2.2.2"
   end
 end

data/spec/dummy/log/development.log

@@ -1420,3 +1420,20 @@ Connecting to database specified by database.yml
    (0.8ms)  CREATE TABLE "oauth_applications" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255) NOT NULL, "uid" varchar(255) NOT NULL, "secret" varchar(255) NOT NULL, "redirect_uri" text NOT NULL, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
    (0.8ms)  CREATE UNIQUE INDEX "index_oauth_applications_on_uid" ON "oauth_applications" ("uid")
    (0.1ms)  SELECT version FROM "schema_migrations"
+Connecting to database specified by database.yml
+   (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+   (0.3ms)  select sqlite_version(*)
+   (1.2ms)  DROP TABLE "dummy_users"
+   (0.7ms)  CREATE TABLE "dummy_users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "username" varchar(255), "password_hash" varchar(255), "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (0.6ms)  DROP TABLE "oauth_access_grants"
+   (0.6ms)  CREATE TABLE "oauth_access_grants" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "resource_owner_id" integer NOT NULL, "application_id" integer NOT NULL, "token" varchar(255) NOT NULL, "expires_in" integer NOT NULL, "redirect_uri" text NOT NULL, "created_at" datetime NOT NULL, "revoked_at" datetime, "scopes" varchar(255)) 
+   (0.7ms)  CREATE UNIQUE INDEX "index_oauth_access_grants_on_token" ON "oauth_access_grants" ("token")
+   (0.7ms)  DROP TABLE "oauth_access_tokens"
+   (0.7ms)  CREATE TABLE "oauth_access_tokens" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "resource_owner_id" integer, "application_id" integer, "token" varchar(255) NOT NULL, "refresh_token" varchar(255), "expires_in" integer, "revoked_at" datetime, "created_at" datetime NOT NULL, "scopes" varchar(255)) 
+   (0.6ms)  CREATE UNIQUE INDEX "index_oauth_access_tokens_on_refresh_token" ON "oauth_access_tokens" ("refresh_token")
+   (0.6ms)  CREATE INDEX "index_oauth_access_tokens_on_resource_owner_id" ON "oauth_access_tokens" ("resource_owner_id")
+   (0.7ms)  CREATE UNIQUE INDEX "index_oauth_access_tokens_on_token" ON "oauth_access_tokens" ("token")
+   (0.6ms)  DROP TABLE "oauth_applications"
+   (0.8ms)  CREATE TABLE "oauth_applications" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255) NOT NULL, "uid" varchar(255) NOT NULL, "secret" varchar(255) NOT NULL, "redirect_uri" text NOT NULL, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (0.6ms)  CREATE UNIQUE INDEX "index_oauth_applications_on_uid" ON "oauth_applications" ("uid")
+   (0.1ms)  SELECT version FROM "schema_migrations"

data/spec/dummy/log/test.log

@@ -2201,3 +2201,40 @@ Connecting to database specified by database.yml
    (0.0ms)  rollback transaction
    (0.0ms)  begin transaction
    (0.0ms)  rollback transaction
+Connecting to database specified by database.yml
+   (0.4ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+  DummyUser Load (0.1ms)  SELECT "dummy_users".* FROM "dummy_users" WHERE "dummy_users"."id" IS NULL LIMIT 1
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (2.3ms)  INSERT INTO "dummy_users" ("created_at", "password_hash", "updated_at", "username") VALUES (?, ?, ?, ?)  [["created_at", Wed, 02 Jul 2014 22:42:02 UTC +00:00], ["password_hash", nil], ["updated_at", Wed, 02 Jul 2014 22:42:02 UTC +00:00], ["username", nil]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+  DummyUser Load (0.1ms)  SELECT "dummy_users".* FROM "dummy_users" WHERE "dummy_users"."id" = 1 LIMIT 1
+   (0.8ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (0.2ms)  INSERT INTO "dummy_users" ("created_at", "password_hash", "updated_at", "username") VALUES (?, ?, ?, ?)  [["created_at", Wed, 02 Jul 2014 22:42:02 UTC +00:00], ["password_hash", nil], ["updated_at", Wed, 02 Jul 2014 22:42:02 UTC +00:00], ["username", nil]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.3ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openstax_api
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - Dante Soares