brainstem 0.2.6 → 0.2.6.1

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 7c38b868345e5b3aaadc1c2746e6963d1daf1f1f
-  data.tar.gz: cccbd5c71854048fb2331fc909e2a7a98c0345ed
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZjgxZDgwYTRkN2Y0NGU0Y2NhMmFiYjMxZmJjNWE0ZmNjOWY3NWQ4Yw==
+  data.tar.gz: !binary |-
+    ZDY4MmYyNjBlZTNlMDJmMmU3Yjk1MDZhYjJhNTY0MDQ3NmY3MjRmMg==
 SHA512:
-  metadata.gz: fec3d2771167970f5198ece98f6febc2d903599167ea2b15ac2d60558e50e8c8ef9cc650e1129cfb29c333dd8d080fcf8705615fb7b445c25ec7a49be9b8e826
-  data.tar.gz: 06a68af6770a08acf1c6ca3379eb5ee2b050b14acc80982af2afb2be8b65e60cc5f257f0de2cd8825741fa040c74c0121f397c9f400cff91b639d649adcc1028
+  metadata.gz: !binary |-
+    NzZkOGU5Y2FlN2I0OTY0ZTkwMzkxYzkyYzMyOTc2MDU5MTA4ODk2NTI0ODEy
+    NzhmYzViODBmN2M2NmFkODk4NTdiM2U4YzBhNTZjODQ1NTllZmUxOWUzZWM3
+    MzFiMmEzMDViNGJkNjkwMmM0NzE1MTg0N2JhYjJkMzVmYzM1NTk=
+  data.tar.gz: !binary |-
+    Mzk5ZmNlMmQ4ZGMxODI0OTY0ZjU1Y2FlYjQ1MDAwOWJiZjk0MDNlMzJhNjVi
+    N2RmMjkwZTUzZjJmM2UyOWE3OWQ1MTMwMzBhMWEyMjZjNjY1MDgwNGY5MTJj
+    YmI2NDBjZTA1N2EzM2Q3ZjFkZWRkNzk3NGYyZDBjZjdjNzY5MGM=

data/Gemfile.lock

@@ -1,39 +1,39 @@
 PATH
   remote: .
   specs:
-    brainstem (0.2.6)
+    brainstem (0.2.6.1)
       activerecord (>= 3.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.1.6)
-      activesupport (= 4.1.6)
+    activemodel (4.2.0)
+      activesupport (= 4.2.0)
       builder (~> 3.1)
-    activerecord (4.1.6)
-      activemodel (= 4.1.6)
-      activesupport (= 4.1.6)
-      arel (~> 5.0.0)
-    activesupport (4.1.6)
-      i18n (~> 0.6, >= 0.6.9)
+    activerecord (4.2.0)
+      activemodel (= 4.2.0)
+      activesupport (= 4.2.0)
+      arel (~> 6.0)
+    activesupport (4.2.0)
+      i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.1)
+      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    arel (5.0.1.20140414130214)
+    arel (6.0.0)
     builder (3.2.2)
     diff-lcs (1.2.5)
-    i18n (0.6.11)
+    i18n (0.7.0)
     json (1.8.1)
-    minitest (5.4.2)
-    rake (10.3.2)
-    redcarpet (3.1.2)
+    minitest (5.5.0)
+    rake (10.4.2)
+    redcarpet (3.2.2)
     rr (1.1.2)
     rspec (3.1.0)
       rspec-core (~> 3.1.0)
       rspec-expectations (~> 3.1.0)
       rspec-mocks (~> 3.1.0)
-    rspec-core (3.1.6)
+    rspec-core (3.1.7)
       rspec-support (~> 3.1.0)
     rspec-expectations (3.1.2)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -41,11 +41,11 @@ GEM
     rspec-mocks (3.1.3)
       rspec-support (~> 3.1.0)
     rspec-support (3.1.2)
-    sqlite3 (1.3.9)
+    sqlite3 (1.3.10)
     thread_safe (0.3.4)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    yard (0.8.7.4)
+    yard (0.8.7.6)
 
 PLATFORMS
   ruby

data/README.md

@@ -86,9 +86,6 @@ The scope passed to `present` could contain any starting conditions that you'd l
 
     GET /api/widgets.json?include=features&order=popularity:desc&location_name=san+francisco
 
-Additionally, requests can have a 'pretty' parameter. When set to true, responses will be pretty-printed.
-Do this by adding `&pretty=true` to the above example.
-
 Responses will look like the following:
 
     {

data/lib/brainstem/presenter.rb

@@ -149,13 +149,14 @@ module Brainstem
     # @api private
     # Makes sure that associations are loaded and converted into ids.
     def load_associations!(model, struct, associations)
+      reflections = Brainstem::PresenterCollection.reflections(model.class)
       struct.to_a.each do |key, value|
         if value.is_a?(AssociationField)
           struct.delete key
           id_attr = value.method_name ? "#{value.method_name}_id" : nil
 
           if id_attr && model.class.columns_hash.has_key?(id_attr)
-            reflection = value.method_name && model.class.reflections[value.method_name.to_sym]
+            reflection = value.method_name && reflections[value.method_name.to_s]
             if reflection && reflection.options[:polymorphic] && !value.ignore_type
               struct["#{key.to_s.singularize}_ref".to_sym] = begin
                 if (id_attr = model.send(id_attr)).present?

data/lib/brainstem/presenter_collection.rb

@@ -108,9 +108,6 @@ module Brainstem
 
       rewrite_keys_as_objects!(struct)
 
-      # Make struct pretty-print when rendered as json, if required.
-      make_pretty_printable!(struct) if options[:params][:pretty] == "true"
-
       struct
     end
 
@@ -175,6 +172,7 @@ module Brainstem
     def calculate_allowed_includes(presenter, presented_class, is_only_query)
       allowed_includes = {}
       model = presented_class.new
+      reflections = Brainstem::PresenterCollection.reflections(model.class)
       presenter.present(model).each do |k, v|
         next unless v.is_a?(AssociationField)
         next if v.restrict_to_only && !is_only_query
@@ -182,8 +180,8 @@ module Brainstem
         if v.json_name
           v.json_name = v.json_name.tableize.to_sym
         else
-          association = model.class.reflections[v.method_name]
-          if !association.options[:polymorphic]
+          association = reflections[v.method_name.to_s]
+          if association && !association.options[:polymorphic]
             v.json_name = association && association.table_name.to_sym
             if v.json_name.nil?
               raise ":json_name is a required option for method-based associations (#{presented_class}##{v.method_name})"
@@ -329,11 +327,11 @@ module Brainstem
       records.tap do |models|
         association_names_to_preload = includes_hash.values.map {|i| i.method_name }
         if models.first
-          reflections = models.first.class.reflections
-          association_names_to_preload.reject! { |association| !reflections.has_key?(association) }
+          reflections = Brainstem::PresenterCollection.reflections(models.first.class)
+          association_names_to_preload.reject! { |association| !reflections.has_key?(association.to_s) }
         end
         if association_names_to_preload.any?
-          preload(models, association_names_to_preload)
+          Brainstem::PresenterCollection.preload(models, association_names_to_preload)
           Brainstem.logger.info "Eager loaded #{association_names_to_preload.join(", ")}."
         end
       end
@@ -375,22 +373,19 @@ module Brainstem
       end
     end
 
-    def preload(models, association_names)
+    # Class Methods
+
+    # In Rails 4.2, ActiveRecord::Base#reflections started being keyed by strings instead of symbols.
+    def self.reflections(klass)
+      klass.reflections.each_with_object({}) { |(key, value), memo| memo[key.to_s] = value }
+    end
+
+    def self.preload(models, association_names)
       if Gem.loaded_specs['activerecord'].version >= Gem::Version.create('4.1')
         ActiveRecord::Associations::Preloader.new.preload(models, association_names)
       else
         ActiveRecord::Associations::Preloader.new(models, association_names).run
       end
     end
-
-    # Modify a hash so that it is pretty-printed when rendered as JSON. Works
-    # by adding a `to_json` singleton method which is called during rendering.
-    # Uses a copy of the hash to avoid recursion issues.
-    def make_pretty_printable!(struct)
-      struct.define_singleton_method(:to_json) do |options = nil|
-        copy = self.deep_dup
-        JSON.pretty_generate(copy)
-      end
-    end
   end
 end

data/lib/brainstem/version.rb

@@ -1,3 +1,3 @@
 module Brainstem
-  VERSION = "0.2.6"
+  VERSION = "0.2.6.1"
 end

data/spec/brainstem/presenter_collection_spec.rb

@@ -259,7 +259,7 @@ describe Brainstem::PresenterCollection do
 
       it "preloads associations when they are full model-level associations" do
         # Here, primary_maven is a method on Workspace, not a true association.
-        mock(@presenter_collection).preload(anything, [:tasks])
+        mock(Brainstem::PresenterCollection).preload(anything, [:tasks])
         result = @presenter_collection.presenting("workspaces", :params => { :include => "tasks" }) { Workspace.order('id desc') }
         expect(result[:tasks].length).to be > 0
       end
@@ -825,22 +825,6 @@ describe Brainstem::PresenterCollection do
         expect(result[:count]).to eq(Workspace.owned_by(bob.to_param).count)
       end
     end
-
-    describe "pretty printing" do
-      before do
-        @user_result = { :count => 1, :users => { 1 => { :username => "bob", :id => "1" } }, :results => [{ :key => "users", :id => "1" }] }
-      end
-
-      it "should return normal json if the pretty parameter is not true" do
-        result = @presenter_collection.presenting("users") { User.where(:id => 1) }
-        expect(result.to_json).to eq(JSON.generate(@user_result))
-      end
-
-      it "should return pretty printed json if the pretty parameter is true" do
-        result = @presenter_collection.presenting("users", :params => { :pretty => "true" }) { User.where(:id => 1) }
-        expect(result.to_json).to eq(JSON.pretty_generate(@user_result))
-      end
-    end
   end
 
   describe "collection methods" do

data/spec/brainstem/presenter_spec.rb

@@ -136,7 +136,7 @@ describe Brainstem::Presenter do
         iso8601_time = /\d{4}-\d{2}-\d{2}T\d{2}\:\d{2}\:\d{2}[-+]\d{2}:\d{2}/
         iso8601_date = /\d{4}-\d{2}-\d{2}/
 
-        struct = TimePresenter.new.present_and_post_process("something")
+        struct = TimePresenter.new.present_and_post_process(Workspace.first)
         expect(struct[:time]).to match(iso8601_time)
         expect(struct[:date]).to match(iso8601_date)
         expect(struct[:recursion][:time]).to match(iso8601_time)

data/spec/spec_helpers/db.rb

@@ -4,28 +4,28 @@ ActiveRecord::Schema.define do
 
   create_table :users, :force => true do |t|
     t.string :username
-    t.timestamps
+    t.timestamps null: true
   end
 
   create_table :workspaces, :force => true do |t|
     t.string :title
     t.string :description
     t.belongs_to :user
-    t.timestamps
+    t.timestamps null: true
   end
 
   create_table :tasks, :force => true do |t|
     t.string :name
     t.integer :parent_id
     t.belongs_to :workspace
-    t.timestamps
+    t.timestamps null: true
   end
 
   create_table :posts, :force => true do |t|
     t.string :body
     t.integer :subject_id
     t.string :subject_type
-    t.timestamps
+    t.timestamps null: true
   end
 end
 

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: brainstem
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.6.1
 platform: ruby
 authors:
 - Mavenlink
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-01 00:00:00.000000000 Z
+date: 2015-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Brainstem allows you to create rich API presenters that know how to filter,
@@ -135,6 +135,7 @@ files:
 - lib/brainstem/time_classes.rb
 - lib/brainstem/version.rb
 - pkg/brainstem-0.2.5.gem
+- pkg/brainstem-0.2.6.gem
 - spec/brainstem/controller_methods_spec.rb
 - spec/brainstem/presenter_collection_spec.rb
 - spec/brainstem/presenter_spec.rb
@@ -153,17 +154,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: ActiveRecord presenters with a rich request API