activerepresenter 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2e128c54484aca4628ca948c70a1fa07c3a2d78903027635f3c026ea26f80ba
-  data.tar.gz: d1fdca6b47e8a057e1158e5b3868d869e17ae92a69f331cc955e9bc55b204b86
+  metadata.gz: a10a69202f671dcad05cfbb9e0b4b74fe2a1cd8145a351991ca84357208556b6
+  data.tar.gz: b723ed839b9cac7cd6cd2250a91cf87583c1fb00a613bd30ddb2fcf707b749c1
 SHA512:
-  metadata.gz: c367b0d38d9d201939822614ecf57d4b7d3d050ff18dcf9108b6b4a1408226be886bd92ef2bb2a4ee394ea43f6cae6dc2caefc48212e9c5238483a630f10153f
-  data.tar.gz: 1dfa1d789f3ceb7ad3650bec72e946d74ce628682fd97f3e027b811ab1f28b43ee16dfe4342de52a11a119347f49841068264c168b11a28e3e87773d37b0ef5c
+  metadata.gz: 108cd5117d37ea8d0bc2d37f613043cfe8ed31e6e5c22c74f640a17b8382c23439edb40a5cba6059b40cae98b556cb334696324cc9f24a8653cf21bd4759116b
+  data.tar.gz: ad85e89000e96519aead14fbba97752c5c99dc760705298613b6a0b458e3d2ae02b17528fdb5c55492e582f3cd590b3dc739c2ae7e42c6a66a89280f3bb64140

data/activerepresenter.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
   s.test_files  = s.files.grep(/^test/)
 
   s.add_dependency "bundler", "~> 1.3"
-  s.add_dependency "activesupport", ">= 5.1", "< 6"
+  s.add_dependency "activemodel", ">= 5.2", "< 6"
+  s.add_dependency "activesupport", ">= 5.2", "< 6"
   s.add_development_dependency "rake", "~> 0"
 end

data/lib/active_representer/base.rb

@@ -1,32 +1,39 @@
 # frozen_string_literal: true
 
-require "active_support/core_ext/class/attribute"
-require "active_support/core_ext/module/delegation"
-require "active_support/inflector"
+require "active_model"
+require "active_support"
 
 module ActiveRepresenter
   class Base
-    attr_reader :wrapped
+    include ActiveModel::Model
+    include ActiveModel::Attributes
+
+    attribute :wrapped
     class_attribute :collections, default: {}
 
     delegate_missing_to :wrapped
 
-    def initialize(wrapped)
-      @wrapped = wrapped
-      self.class.collection_names.each do |collection_name|
-        next if wrapped[collection_name].nil?
-        representer = self.class.collections[collection_name]
-        collection_value = \
-          if representer
-            wrapped[collection_name].map { |item| representer.new(item) }
-          else
-            wrapped[collection_name]
-          end
-        instance_variable_set("@#{collection_name}", collection_value)
+    class << self
+      def wrap(wrapped)
+        instance = new
+        instance.wrapped = wrapped
+        collection_names.each do |collection_name|
+          next if wrapped[collection_name].nil?
+          representer_klass = collections[collection_name]
+          collection_value = \
+            if representer_klass
+              wrapped[collection_name].map { |item| representer_klass.wrap(item) }
+            else
+              wrapped[collection_name]
+            end
+          instance.instance_variable_set("@#{collection_name}", collection_value)
+        end
+        attribute_names.each do |attribute_name|
+          instance.send("#{attribute_name}=", wrapped.send(attribute_name))
+        end
+        instance
       end
-    end
 
-    class << self
       def attr_collection(name, **options)
         unless name.is_a?(Symbol) || name.is_a?(String)
           raise ArgumentError.new("collection's name must be a Symbol or a String")
@@ -49,6 +56,10 @@ module ActiveRepresenter
         collections.keys
       end
 
+      def attribute_names
+        attribute_types.keys - ["wrapped"]
+      end
+
       def guess_representrer_name(name)
         "#{name.singularize.camelize}Representer"
       end

data/test/attribute_test.rb

@@ -0,0 +1,50 @@
+require "test/unit"
+require "ostruct"
+require_relative "../lib/active_representer/base.rb"
+
+class UserRepresenter < ActiveRepresenter::Base
+  attribute :first_name, :string
+  attribute :last_name, :string
+  attribute :age, :integer
+
+  def full_name
+    "#{first_name} #{last_name}"
+  end
+end
+
+class InheritanceTest < Test::Unit::TestCase
+  test ".wrap does not raise error" do
+    user = OpenStruct.new(first_name: 'John', last_name: 'Appleseed')
+    assert_nothing_raised { UserRepresenter.wrap(user) }
+  end
+
+  test "#wrapped returns user object" do
+    user = OpenStruct.new(first_name: 'John', last_name: 'Appleseed')
+    representer = UserRepresenter.wrap(user)
+    assert_equal(representer.wrapped, user)
+  end
+
+  test "#first_name returns John" do
+    user = OpenStruct.new(first_name: 'John', last_name: 'Appleseed')
+    representer = UserRepresenter.wrap(user)
+    assert_equal(representer.first_name, 'John')
+  end
+
+  test "#last_name returns Appleseed" do
+    user = OpenStruct.new(first_name: 'John', last_name: 'Appleseed')
+    representer = UserRepresenter.wrap(user)
+    assert_equal(representer.last_name, 'Appleseed')
+  end
+
+  test "#full_name returns John Appleseed" do
+    user = OpenStruct.new(first_name: 'John', last_name: 'Appleseed')
+    representer = UserRepresenter.wrap(user)
+    assert_equal(representer.full_name, 'John Appleseed')
+  end
+
+  test "#age returns 30" do
+    user = OpenStruct.new(first_name: 'John', last_name: 'Appleseed', age: 30)
+    representer = UserRepresenter.wrap(user)
+    assert_equal(representer.age, 30)
+  end
+end

data/test/base_test.rb

@@ -1,15 +1,15 @@
 require "test/unit"
-require "activerepresenter"
+require_relative "../lib/active_representer/base.rb"
 
 class BaseTest < Test::Unit::TestCase
-  test ".new does not raise error" do
+  test ".wrap does not raise error" do
     wrapped = {}
-    assert_nothing_raised { ActiveRepresenter::Base.new(wrapped) }
+    assert_nothing_raised { ActiveRepresenter::Base.wrap(wrapped) }
   end
 
   test "#wrapped returns original wrapped object" do
     wrapped = {}
-    representer = ActiveRepresenter::Base.new(wrapped)
+    representer = ActiveRepresenter::Base.wrap(wrapped)
     assert_equal(representer.wrapped, wrapped)
   end
 end

data/test/collection_test.rb

@@ -1,7 +1,7 @@
 require "test/unit"
-require_relative "../lib/active_representer/base.rb"
 require "ostruct"
 require "active_support/time"
+require_relative "../lib/active_representer/base.rb"
 
 class ActivityRepresenter < ActiveRepresenter::Base
   def created_on
@@ -19,24 +19,24 @@ class UserRepresenter < ActiveRepresenter::Base
 end
 
 class CollectionTest < Test::Unit::TestCase
-  test ".new does not raise error" do
+  test ".wrap does not raise error" do
     user = OpenStruct.new(first_name: 'John', last_name: 'Appleseed')
-    assert_nothing_raised { UserRepresenter.new(user) }
+    assert_nothing_raised { UserRepresenter.wrap(user) }
   end
 
   test "#full_name returns John Appleseed" do
     user = OpenStruct.new(first_name: 'John', last_name: 'Appleseed')
-    representer = UserRepresenter.new(user)
+    representer = UserRepresenter.wrap(user)
     assert_equal(representer.full_name, 'John Appleseed')
   end
 
-  test ".new does not raise error when activities are specified" do
+  test ".wrap does not raise error when activities are specified" do
     user = OpenStruct.new(
       first_name: 'John',
       last_name: 'Appleseed',
       activities: [OpenStruct.new(created_at: Time.now)]
     )
-    assert_nothing_raised { UserRepresenter.new(user) }
+    assert_nothing_raised { UserRepresenter.wrap(user) }
   end
 
   test "activity is represented" do
@@ -45,7 +45,7 @@ class CollectionTest < Test::Unit::TestCase
       last_name: 'Appleseed',
       activities: [OpenStruct.new(created_at: Time.now)]
     )
-    representer = UserRepresenter.new(user)
+    representer = UserRepresenter.wrap(user)
     activity = representer.activities.first
     assert_instance_of(ActivityRepresenter, activity)
   end
@@ -56,7 +56,7 @@ class CollectionTest < Test::Unit::TestCase
       last_name: 'Appleseed',
       activities: [OpenStruct.new(created_at: Time.now)]
     )
-    representer = UserRepresenter.new(user)
+    representer = UserRepresenter.wrap(user)
     activity = representer.activities.first
     assert_equal(activity.created_on, Date.today)
   end
@@ -67,7 +67,7 @@ class CollectionTest < Test::Unit::TestCase
       last_name: 'Appleseed',
       notifications: [OpenStruct.new(created_at: Time.now)]
     )
-    representer = UserRepresenter.new(user)
+    representer = UserRepresenter.wrap(user)
     notification = representer.notifications.first
     assert_instance_of(OpenStruct, notification)
   end

data/test/inheritance_test.rb

@@ -1,6 +1,6 @@
 require "test/unit"
-require "activerepresenter"
 require "ostruct"
+require_relative "../lib/active_representer/base.rb"
 
 class UserRepresenter < ActiveRepresenter::Base
   def full_name
@@ -9,32 +9,32 @@ class UserRepresenter < ActiveRepresenter::Base
 end
 
 class InheritanceTest < Test::Unit::TestCase
-  test ".new does not raise error" do
+  test ".wrap does not raise error" do
     user = OpenStruct.new(first_name: 'John', last_name: 'Appleseed')
-    assert_nothing_raised { UserRepresenter.new(user) }
+    assert_nothing_raised { UserRepresenter.wrap(user) }
   end
 
   test "#wrapped returns user object" do
     user = OpenStruct.new(first_name: 'John', last_name: 'Appleseed')
-    representer = UserRepresenter.new(user)
+    representer = UserRepresenter.wrap(user)
     assert_equal(representer.wrapped, user)
   end
 
   test "#first_name returns John" do
     user = OpenStruct.new(first_name: 'John', last_name: 'Appleseed')
-    representer = UserRepresenter.new(user)
+    representer = UserRepresenter.wrap(user)
     assert_equal(representer.first_name, 'John')
   end
 
   test "#last_name returns Appleseed" do
     user = OpenStruct.new(first_name: 'John', last_name: 'Appleseed')
-    representer = UserRepresenter.new(user)
+    representer = UserRepresenter.wrap(user)
     assert_equal(representer.last_name, 'Appleseed')
   end
 
   test "#full_name returns John Appleseed" do
     user = OpenStruct.new(first_name: 'John', last_name: 'Appleseed')
-    representer = UserRepresenter.new(user)
+    representer = UserRepresenter.wrap(user)
     assert_equal(representer.full_name, 'John Appleseed')
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerepresenter
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Ryo Hashimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-20 00:00:00.000000000 Z
+date: 2018-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -24,13 +24,33 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: '6'
@@ -40,7 +60,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: '6'
@@ -69,6 +89,7 @@ files:
 - activerepresenter.gemspec
 - lib/active_representer/base.rb
 - lib/activerepresenter.rb
+- test/attribute_test.rb
 - test/base_test.rb
 - test/collection_test.rb
 - test/inheritance_test.rb
@@ -98,6 +119,7 @@ specification_version: 4
 summary: Active Representer provides model objects by decorating objects (part of
   Lightrails).
 test_files:
+- test/attribute_test.rb
 - test/base_test.rb
 - test/collection_test.rb
 - test/inheritance_test.rb