shaf 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac593813e29022a180b2109f36148800fd17d60ab86f9bd9e580a22d8a42687c
-  data.tar.gz: 0b54202b8c00b336ddbb8ec945586dd2bd3b73f1434252ca347a4ebde6764116
+  metadata.gz: a160e3aeb1d9b86b59371417e6354d351acfbe9a90efde270b51a1fe2a307a88
+  data.tar.gz: d3c9eec43a5b5da8795e1e9396f8916be2458d235a14296c75646be25680b658
 SHA512:
-  metadata.gz: f38cd019699f44e951eef30d734577c8ddbde792616ba0f887cf8f8d84544c553efd332679e8cf303b55f8d948ed08d28de960cc57e401e1dd8121c857818edc
-  data.tar.gz: e0ff681691982c261b114faef75f58cf6e5f18a63183040eb35e1679e6448c071d8499583cb55827cf8c579e1c0104cc71d4f6633c0451f1256a7ddc5e57ccb0
+  metadata.gz: '093623e69f3fdf57124cdabd6b01c00129fe77e479ec54aa5d3fdef252ec92fa93895b99708ca7c831421c11c838dbe9e034acec9546c96fc1a5f6197bd39211'
+  data.tar.gz: 4305a775fff58412125a1c984d27617c87fdd3d0fa1f20b798f6b47978aeafb34996bcd8f67b97f6ac1e3e1a2f117bf55c33f4e615af10bc0fdf917d61730231

data/lib/shaf/command/templates/Gemfile.erb

@@ -8,7 +8,6 @@ gem 'sinatra', require: 'sinatra/base'
 gem 'rake'
 gem 'thin'
 gem 'sequel'
-gem 'sequel'
 gem 'sinatra-sequel'
 gem 'bcrypt'
 gem 'hal_presenter'

data/lib/shaf/generator/controller.rb

@@ -71,7 +71,7 @@ module Shaf
         file = "api/serializers/root_serializer.rb"
         unless File.exist? file
           puts "Warning: file '#{file}' does not exist. "\
-            "Not adding any link to the #{plural_name} collection"
+            "Skip adding link to the #{plural_name} collection"
         end
         added = false
         content = []

data/lib/shaf/generator/templates/spec/integration_spec.rb.erb

@@ -8,6 +8,9 @@ describe <%= model_class_name %>, type: :integration do
     status.must_equal 200
     link_rels.must_include(:self)
     links[:self][:href].must_equal <%= name %>_uri(<%= name %>)
+<% params.each do |param| -%>
+    attributes.must_include(:'<%= param[0] %>')
+<% end -%>
   end
 
   it "lists all <%= plural_name %>" do
@@ -18,9 +21,13 @@ describe <%= model_class_name %>, type: :integration do
     status.must_equal 200
     link_rels.must_include(:self)
     links[:self][:href].must_include <%= plural_name %>_uri
-    embedded :'<%= plural_name %>' do
-      <%= plural_name %> = last_payload
-      <%= plural_name %>.size.must_equal 2
+    embedded(:'<%= plural_name %>').size.must_equal 2
+
+    each_embedded :'<%= plural_name %>' do
+      link_rels.must_include(:self)
+<% params.each do |param| -%>
+      attributes.must_include(:'<%= param[0] %>')
+<% end -%>
     end
   end
 

data/lib/shaf/spec/payload_utils.rb

@@ -21,13 +21,13 @@ module Shaf
           @assertions = 0
         end
 
-        def call
-          instance_exec(&@block)
+        def call(*args)
+          instance_exec(*args, &@block)
         end
 
         def method_missing(method, *args, &block)
           if @context&.respond_to? method
-            define_singleton_method(method) { |*a, &b| @context.public_send method, *a, &b }
+            define_singleton_method(method) { |*a, &b| @context.public_send(method, *a, &b) }
             return public_send(method, *args, &block)
           end
           super
@@ -37,7 +37,6 @@ module Shaf
           return true if @context&.respond_to? method
           super
         end
-
       end
 
       def set_payload(payload)
@@ -73,16 +72,15 @@ module Shaf
         Embedded.new(last_payload.dig(*keys), self, Proc.new).call
       end
 
-      def embedded_each(name, &block)
+      def each_embedded(name, &block)
         assert_has_embedded name
         list = last_payload[:_embedded][name]
-        assert_instance_of(
-          Array,
-          list,
+
+        assert_instance_of Array, list,
           "Embedded '#{name}' is not an instance of Array. Actual: #{list.class}"
-        )
-        list.each do |resource|
-          Embedded.new(resource, block).call
+
+        list.each_with_index do |resource, i|
+          Embedded.new(resource, self, block).call(i)
         end
       end
 

data/lib/shaf/version.rb

@@ -1,3 +1,3 @@
 module Shaf
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data.tar.gz.sig

@@ -1 +1 @@
-RK��O(���	D�{k⮼_4�6븘���{�}��l�T����:Q���*ab$���Ϸ��R2��T�
�mnq��Jt�>����ل��ʡ�0#N�'u�k�UN�,�[�	�T$ɷ6��5�����]W|��-eexȘp�>�7�q��y������_R�kr�V�.Y����n7n�;Ws��4Y�.�9ZHT����Y��>�P�M��2�b�RK����r��|í���*�Q]�)(6���-�� ��d1��
+i�.Օ2��r��5�VyEd��#LԞ���
1�h�^@�I�s�ߚ����?�֞����5A�C��f�b	K�����M�e����V�V�38Yc�D�S��?��.��b)�Qv�Dy��cE,r=aRN)�$|��@̻�ܙ�$1�Wf��ϩ��dVd�����u�g���B��e��@�\�w�����-��l9�y��
��s�|�7:<Z�H	�'�#H�94v�Vn�C�e�۠K8�xXx�/nY����

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shaf
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Sammy Henningsson
@@ -31,7 +31,7 @@ cert_chain:
   CNZdF8Vavp6xMQbPHZwqjaeZz2WRXYS7jyYSvCunjwa3OtvXtfbIEGEWE6IM+t9k
   H1g6Q+B6qk9O6g==
   -----END CERTIFICATE-----
-date: 2018-03-08 00:00:00.000000000 Z
+date: 2018-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake