glib-web 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91bbaabb7ba267a91d4f7ff4b8cdd3b142fe2dc2
-  data.tar.gz: 22db4840a440ef31d8161267f366c24ea0e39365
+  metadata.gz: d1d23736ab1385ea517451aa33bebd883ef4b435
+  data.tar.gz: 2e0924b9b4aeaca57659e55d5c9f9a4ee5bf08f6
 SHA512:
-  metadata.gz: 4f70589581f61e65eb0f4dd4d09b07657c30fde7fc8067d0f30c6577ebfa55af9d42f7ad513e4cc7ae3058542619758d2d9bf04cfffaf372d1822a99a975ce35
-  data.tar.gz: 3ce7731eef560c59759fc483d16f3516d88f6f5e849489452d2a4c93120f805d128b3f1a4583e68fa67650ed41ae621c496b7b4f510294d53d6b31497914731e
+  metadata.gz: 648ab483946b51659c3f2c3039ada0427655ef1a722ed75cf51b48e643bb40d1927b04f7398bd063abc44abe47f49198b2d1c883863afe0df4fbd747893c8591
+  data.tar.gz: 340c83ff4c79a0146d55323e81a195d10235d5d2c8f393321e7a7c2826079cf3bb37bd85a759fb8f0e37aa89a2b3058dae9128e969e717c14f9d738676fbbb18

data/app/helpers/glib/json_ui/abstract_builder.rb

@@ -16,7 +16,7 @@ module Glib
 
       def add_singleton_element type, name, *args
         name_components = name.to_s.split('_')
-        json.set! type, "#{name_components.join('/')}-v1" if type
+        json.set! type, "#{name_components.join('/')}" if type
         args = [yield] if block_given?
         "#{self.class.name}::#{name_components.map{ |str| capitalize_first_letter_and_leave_others_alone(str) }.join('::')}".constantize.new(json, @page).parse(*args)
       end
@@ -26,6 +26,22 @@ module Glib
           add_singleton_element type, name, *args
         end
       end
+
+      # TODO: Consider removing this in favour of non 'v1' suffix
+      def add_singleton_element_v1 type, name, *args
+        name_components = name.to_s.split('_')
+        json.set! type, "#{name_components.join('/')}-v1" if type
+        args = [yield] if block_given?
+        "#{self.class.name}::#{name_components.map{ |str| capitalize_first_letter_and_leave_others_alone(str) }.join('::')}".constantize.new(json, @page).parse(*args)
+      end
+      
+      # TODO: Consider removing this in favour of non 'v1' suffix
+      def add_element_to_array_v1 type, name, *args
+        json.child! do
+          add_singleton_element_v1 type, name, *args
+        end
+      end
+      
     end
 
     class JsonUiElement

data/app/helpers/glib/json_ui/action_builder.rb

@@ -2,7 +2,7 @@ module Glib
   module JsonUi
     class ActionBuilder < AbstractBuilder
       def method_missing m, *args
-        add_singleton_element 'action', m, *args
+        add_singleton_element_v1 'action', m, *args
       end
       
       class Action < JsonUiElement

data/app/helpers/glib/json_ui/menu_builder.rb

@@ -2,7 +2,7 @@ module Glib
   module JsonUi
     class MenuBuilder < AbstractBuilder
       def method_missing m, *args
-        add_element_to_array nil, m, *args
+        add_element_to_array_v1 nil, m, *args
       end
 
       class MenuItem < JsonUiElement

data/app/helpers/glib/json_ui/view_builder.rb

@@ -2,7 +2,7 @@ module Glib
   module JsonUi
     class ViewBuilder < AbstractBuilder
       def add_view name, *args
-        add_element_to_array 'view', name, *args
+        add_element_to_array_v1 'view', name, *args
       end
 
       def method_missing m, *args

data/app/views/json_ui/garage/lists/_infinite_scroll_section.json.jbuilder

@@ -3,7 +3,7 @@ json.rows do
   batch_count.times do |i|
     index = page * batch_count + i
     json.child! do
-      json.template 'thumbnail-v1'
+      json.template 'thumbnail'
       json.title "Item #{index}"
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - ''