shamu 0.0.21 → 0.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6cae4307a05211be596027da64335d8e7ea8a873
-  data.tar.gz: 11c2070a6bab4b24e9770dbb6c92bd00f39b10ca
+  metadata.gz: 7021878c4a969d4191c47a51fd5833c4dbfac2ef
+  data.tar.gz: d1856e4d896fd0798bc297b3d2fc2647cff14492
 SHA512:
-  metadata.gz: 626bd61e2a680af882d36bea800ce9229213e92dd0b1c474dd81aba7834768ea5659b87ec3294cdd59b077885a24a7869fa848b77eade04fa0971394f56a76fe
-  data.tar.gz: 9b3bab05830afd1b09bb9662348a6e404d7b03e2e817407afb5d0b70e035a20a3f3e1358bbab4bdbadbe1e072c755382b933bcd2122a6a4ff296e85964501ace
+  metadata.gz: 5dd78cd63aac4c2547bc5d7c467a968ee0543f66eabfcb1025308c1d95cdce9b9e23c482d9ae7f2a180cabde51427fcf2429825fbe0e921a475f9098eeae673b
+  data.tar.gz: 97e94eafab8cf431c311b2feb9252e590b6af9b6f276e97a2ac034259f75d7de3b26a81309ba9fef648c17f4c30cc8c8851be5c385ebb4734fe98c21da236360

data/.rubocop.yml

@@ -36,7 +36,7 @@ Metrics/LineLength:
   Max: 120
 
 Metrics/MethodLength:
-  Max: 15
+  Max: 25
 
 Metrics/AbcSize:
   Max: 24

data/.ruby-version

@@ -1 +1 @@
-2.4.0
+2.4.1

data/Gemfile

@@ -11,7 +11,7 @@ group :test do
   gem "responders", "~> 2.1.2"
   gem "kaminari", "~> 0.16.3", require: false
 
-  gem "byebug"
+  gem "byebug", "9.0.6"
   gem "pry-byebug"
 
   gem "sqlite3", "~> 1.3.11"
@@ -30,6 +30,8 @@ group :test do
   gem "ruby_gntp", "~> 0.3.4"
   gem "awesome_print"
 
+  gem "nokogiri", "1.8.0"
+
   gem "codeclimate-test-reporter", "~> 1.0 ", group: :test, require: nil
   gem "rspec_junit_formatter", "~> 0.2.2", platforms: :mri
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    shamu (0.0.21)
+    shamu (0.0.24)
       activemodel (>= 5.0)
       activesupport (>= 5.0)
       crc32 (~> 1)
@@ -9,61 +9,62 @@ PATH
       loofah (~> 2)
       multi_json (~> 1.11)
       rack (>= 1)
-      scorpion-ioc (~> 0.6)
+      scorpion-ioc (~> 1.0.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.0.3)
-      actionpack (= 5.0.3)
+    actioncable (5.0.6)
+      actionpack (= 5.0.6)
       nio4r (>= 1.2, < 3.0)
       websocket-driver (~> 0.6.1)
-    actionmailer (5.0.3)
-      actionpack (= 5.0.3)
-      actionview (= 5.0.3)
-      activejob (= 5.0.3)
+    actionmailer (5.0.6)
+      actionpack (= 5.0.6)
+      actionview (= 5.0.6)
+      activejob (= 5.0.6)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.0.3)
-      actionview (= 5.0.3)
-      activesupport (= 5.0.3)
+    actionpack (5.0.6)
+      actionview (= 5.0.6)
+      activesupport (= 5.0.6)
       rack (~> 2.0)
       rack-test (~> 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.0.3)
-      activesupport (= 5.0.3)
+    actionview (5.0.6)
+      activesupport (= 5.0.6)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.0.3)
-      activesupport (= 5.0.3)
+    activejob (5.0.6)
+      activesupport (= 5.0.6)
       globalid (>= 0.3.6)
-    activemodel (5.0.3)
-      activesupport (= 5.0.3)
-    activerecord (5.0.3)
-      activemodel (= 5.0.3)
-      activesupport (= 5.0.3)
+    activemodel (5.0.6)
+      activesupport (= 5.0.6)
+    activerecord (5.0.6)
+      activemodel (= 5.0.6)
+      activesupport (= 5.0.6)
       arel (~> 7.0)
-    activesupport (5.0.3)
+    activesupport (5.0.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     arel (7.1.4)
     ast (2.3.0)
-    awesome_print (1.7.0)
+    awesome_print (1.8.0)
     builder (3.2.3)
     byebug (9.0.6)
     codeclimate-test-reporter (1.0.7)
       simplecov
-    coderay (1.1.1)
-    combustion (0.6.0)
+    coderay (1.1.2)
+    combustion (0.7.0)
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
       thor (>= 0.14.6)
     concurrent-ruby (1.0.5)
+    crass (1.0.2)
     crc32 (1.0.1)
     diff-lcs (1.3)
     docile (1.1.5)
@@ -89,10 +90,10 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    guard-rubocop (1.2.0)
+    guard-rubocop (1.3.0)
       guard (~> 2.0)
       rubocop (~> 0.20)
-    i18n (0.8.1)
+    i18n (0.8.6)
     json (2.1.0)
     kaminari (0.16.3)
       actionpack (>= 3.0.0)
@@ -101,68 +102,68 @@ GEM
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
-    loofah (2.0.3)
+    loofah (2.1.1)
+      crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     lumberjack (1.0.12)
     mail (2.6.6)
       mime-types (>= 1.16, < 4)
-    method_source (0.8.2)
+    method_source (0.9.0)
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
-    mini_portile2 (2.1.0)
-    minitest (5.10.2)
-    multi_json (1.12.1)
+    mini_portile2 (2.2.0)
+    minitest (5.10.3)
+    multi_json (1.12.2)
     nenv (0.3.0)
     nio4r (2.1.0)
-    nokogiri (1.7.2)
-      mini_portile2 (~> 2.1.0)
+    nokogiri (1.8.0)
+      mini_portile2 (~> 2.2.0)
     notiffany (0.1.1)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    parallel (1.11.2)
+    parallel (1.12.0)
     parser (2.4.0.0)
       ast (~> 2.2)
     powerpack (0.1.1)
-    pry (0.10.4)
+    pry (0.11.1)
       coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    pry-byebug (3.4.2)
-      byebug (~> 9.0)
+      method_source (~> 0.9.0)
+    pry-byebug (3.4.3)
+      byebug (>= 9.0, < 9.1)
       pry (~> 0.10)
     rack (2.0.3)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (5.0.3)
-      actioncable (= 5.0.3)
-      actionmailer (= 5.0.3)
-      actionpack (= 5.0.3)
-      actionview (= 5.0.3)
-      activejob (= 5.0.3)
-      activemodel (= 5.0.3)
-      activerecord (= 5.0.3)
-      activesupport (= 5.0.3)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 5.0.3)
+    rails (5.0.6)
+      actioncable (= 5.0.6)
+      actionmailer (= 5.0.6)
+      actionpack (= 5.0.6)
+      actionview (= 5.0.6)
+      activejob (= 5.0.6)
+      activemodel (= 5.0.6)
+      activerecord (= 5.0.6)
+      activesupport (= 5.0.6)
+      bundler (>= 1.3.0)
+      railties (= 5.0.6)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (5.0.3)
-      actionpack (= 5.0.3)
-      activesupport (= 5.0.3)
+    railties (5.0.6)
+      actionpack (= 5.0.6)
+      activesupport (= 5.0.6)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rainbow (2.2.2)
       rake
-    rake (12.0.0)
-    rb-fsevent (0.9.8)
-    rb-inotify (0.9.8)
-      ffi (>= 0.5.0)
+    rake (12.1.0)
+    rb-fsevent (0.10.2)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
     responders (2.1.2)
       railties (>= 4.2.0, < 5.1)
     rspec (3.6.0)
@@ -180,7 +181,7 @@ GEM
     rspec-mocks (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.6.0)
-    rspec-rails (3.6.0)
+    rspec-rails (3.6.1)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
@@ -201,33 +202,32 @@ GEM
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.8.1)
+    ruby-progressbar (1.9.0)
     ruby_dep (1.5.0)
     ruby_gntp (0.3.4)
-    scorpion-ioc (0.6.0)
+    scorpion-ioc (1.0.1)
       rails (>= 4.0)
     shellany (0.0.1)
-    simplecov (0.14.1)
+    simplecov (0.15.1)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.1)
-    slop (3.6.0)
-    spring (2.0.1)
+    simplecov-html (0.10.2)
+    spring (2.0.2)
       activesupport (>= 4.2)
     sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.0)
+    sprockets-rails (3.2.1)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     sqlite3 (1.3.13)
-    thor (0.19.4)
+    thor (0.20.0)
     thread_safe (0.3.6)
     tzinfo (1.2.3)
       thread_safe (~> 0.1)
-    unicode-display_width (1.2.1)
+    unicode-display_width (1.3.0)
     websocket-driver (0.6.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)
@@ -243,7 +243,7 @@ DEPENDENCIES
   activerecord (~> 5.0)
   awesome_print
   bundler (~> 1.6)
-  byebug
+  byebug (= 9.0.6)
   codeclimate-test-reporter (~> 1.0)
   combustion (~> 0.5)
   fuubar
@@ -252,6 +252,7 @@ DEPENDENCIES
   guard-rubocop
   i18n (~> 0.7)
   kaminari (~> 0.16.3)
+  nokogiri (= 1.8.0)
   pry-byebug
   rake
   responders (~> 2.1.2)
@@ -270,4 +271,4 @@ DEPENDENCIES
   yard-activesupport-concern
 
 BUNDLED WITH
-   1.14.6
+   1.15.3

data/app/README

@@ -0,0 +1 @@
+Here to make vim-rails work

data/config/environment.rb

@@ -0,0 +1 @@
+# Dummy file to make vim-rails work

data/lib/shamu/attributes.rb

@@ -76,6 +76,32 @@ module Shamu
       instance_variable_defined? :"@#{ attribute }"
     end
 
+    # @return [Hash] the assigned attributes as a hash for JSON serialization.
+    def as_json( options = {} ) # rubocop:disable Styles/OptionHash
+      to_attributes( options.slice( :only, :except ) ).as_json
+    end
+
+    # @return [String] JSON encoded version of the assigned attributes.
+    def to_json( options = {} ) # rubocop:disable Styles/OptionHash
+      as_json( options ).to_json
+    end
+
+    def pretty_print( pp )
+      attributes = to_attributes
+
+      pp.object_address_group( self ) do
+        pp.seplist( attributes.keys, -> { pp.text "," } ) do |name|
+          pp.breakable " "
+          pp.group( 1 ) do
+            pp.text name.to_s
+            pp.text ":"
+            pp.breakable " "
+            pp.pp attributes[ name ]
+          end
+        end
+      end
+    end
+
     private
 
       def match_attribute?( pattern, name )

data/lib/shamu/attributes/equality.rb

@@ -12,6 +12,7 @@ module Shamu
       # @return [Boolean] true if the two objects are of the same type and
       #     attributes are all eql? to each other.
       def ==( other )
+        return true if other.object_id == object_id
         return false unless other.is_a?( self.class ) || is_a?( other.class )
         attributes_eql?( other )
       end
@@ -31,10 +32,18 @@ module Shamu
         def attributes_eql?( other )
           self.class.attributes.all? do |key, attr|
             next true if attr[:ignore_equality]
-            send( key ).eql?( other.send( key ) )
+            attribute_eql?( other, key )
           end
         end
 
+        # @param [Object] other the other object.
+        # @param [Symbol] attr the name of the other attribute.
+        # @return [Boolean] true if the value of the given attribute is equal
+        # on the current object and the other object.
+        def attribute_eql?( other, attr )
+          send( attr ).eql?( other.send( attr ) )
+        end
+
     end
   end
 end

data/lib/shamu/entities/entity.rb

@@ -143,6 +143,17 @@ module Shamu
           super && !options[:model]
         end
 
+        def attribute_eql?( other, name )
+          value = send( name )
+          other_value = other.send( name )
+
+          if value.is_a?( Entity ) || other_value.is_a?( Entity )
+            return value.id.eql?( other_value.id )
+          else
+            value.eql?( other_value )
+          end
+        end
+
       class << self
 
         # @return [ActiveModel::Name] used by url_helpers etc when generating

data/lib/shamu/entities/list_scope.rb

@@ -87,6 +87,9 @@ module Shamu
           name = base_name.sub /(Entity)?$/, "ListScope"
           begin
             return name.constantize
+
+            # Rescuing instead of using const_defined? so that active record can
+            # do it's auto-loading magic.
           rescue NameError # rubocop:disable Lint/HandleExceptions
           end
 

data/lib/shamu/entities/list_scope/sorting.rb

@@ -42,7 +42,12 @@ module Shamu
         def self.included( base )
           super
 
-          base.attribute :sort_by, as: :order, coerce: ->( *values ) { parse_sort_by( values ) }
+          base.attribute :default_sort_by, as: :default_order,
+                                           coerce: ->( *values ) { parse_sort_by( values ) }
+
+          base.attribute :sort_by, as: :order,
+                                   coerce: ->( *values ) { parse_sort_by( values ) },
+                                   default: ->() { default_sort_by }
         end
 
         # @return [Boolean] true if the scope is paged.

data/lib/shamu/entities/list_scope/window_paging.rb

@@ -35,7 +35,7 @@ module Shamu
         #
         # @!endgroup Attributes
 
-        def self.included( base ) # rubocop:disable Metrics/MethodLength
+        def self.included( base )
           super
 
           base.attribute :first, coerce: :to_i, default: ->() { default_first }

data/lib/shamu/entities/null_entity.rb

@@ -50,15 +50,21 @@ module Shamu
         AUTO_FORMATTED_ATTRIBUTES.each do |attr|
           next unless base.attributes.key?( attr )
 
-          base_name ||= begin
-            name = base.name || "Resource"
-            name.split( "::" )
-                .last
-                .sub( /Entity/, "" )
-                .gsub( /(.)([[:upper:]])/, '\1 \2' )
-          end
+          base_name ||=
+            begin
+              name = base.superclass.name || "Resource"
+              name.split( "::" )
+                  .last
+                  .sub( /Entity/, "" )
+                  .gsub( /(.)([[:upper:]])/, '\1 \2' )
+            end
           base.attribute attr, default: "Unknown #{ base_name }"
         end
+
+        # Make sure the null version has the model name.
+        def base.model_name
+          superclass.model_name
+        end
       end
 
       # Dynamically generate a new null entity class.
@@ -73,11 +79,11 @@ module Shamu
         end
 
         unless null_klass
-          null_klass = Class.new( entity_class ) do
-            include ::Shamu::Entities::NullEntity
-          end
-
+          null_klass = Class.new( entity_class )
           entity_class.const_set :NullEntity, null_klass
+
+          # After const_set so we have name and inheritance
+          null_klass.include ::Shamu::Entities::NullEntity
         end
 
         null_klass
@@ -85,4 +91,4 @@ module Shamu
 
     end
   end
-end
+end