plastic_cup 0.1.0 → 0.1.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGI3ODk4MmZmMmM2MzYzYTk5ZmJlOGJiYmQ4YmVlZDU4YjM4YTFmYg==
+    ZTcyZjliNGZhNGY1YmMyZjliNzFiMmE3NTMxZWM4ZmYwMmZhNjNkMA==
   data.tar.gz: !binary |-
-    NThhNDRiNWY5NzVmMTczZmZiOTZjMDVlMjNmZDc4YzhjMDQwYmFhZA==
+    MTY0Yzc5MjY4NzllMDk4ZjZkMTQyMWQwMzcxMTFiOTkyZThmMDkxNw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YjVmN2ZjYjVlNDcyYzU0MGJhMmQ3NGY2YzAwYzA5N2RkMTliNjY3ZDNiOGJj
-    ZjVlOWYzNzQxNjhlOTUwODQ4MmE2ZDIyN2JjMWMwMzg5MTBiMTE1M2QzMTI1
-    YmFjODlmMmRmMjgyYjdiOGRjODQ0ZjU5OWE4OTg3NDQzNTYyMWQ=
+    NzlkODA5MWJmNmFhMDYzNDE3YWRmMTBhMjU5MWZjZWQ3MjgxZDhhNDE0MTNl
+    YmU5MGEzOTI4MDQ3NTExNjgwYWU0YmYwYjQ2MjgyNWJkNTg3MzZkYTdkNjUz
+    N2UxNGEzYjcyODJlODU5ZDIwMzhiZTlkMDNlMzhlYzdmYTRkYzg=
   data.tar.gz: !binary |-
-    MDcwYWQ4NzczZTIxZmVmZWJhM2U0ZjdlZDhhODRiZjllMmJlODE2ZWJmZTkx
-    NmMzNDg2MWMxZWNjOGY5MTlkMzM0MDdiNjZiOGRlZDU2YzZhMzdiMGY0NTY3
-    N2Q2Y2FhMGE1MTBkNzNmYmYwNjQzMGJlMjFjYjYxNTk3MWQ4MmU=
+    ODFhMzU2MjcyNmQxOTQ2ODY2ODA4YTc4MTllZDZiOTZjOTEzMjcyYmVhZDkw
+    Yjc3OGUxNTZiZGEzNTZiZmM4NmE3NzhmZjliMjFjOTgxMzdjMGY4OTlkZTA1
+    MDMwZDBlOWFlNDFiZWRjY2U4NTViM2M5MzZhNWE4YWJhYWE3ODM=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    plastic_cup (0.1.0)
+    plastic_cup (0.1.1)
 
 GEM
   remote: https://rubygems.org/

data/lib/plastic_cup/base.rb

@@ -8,16 +8,7 @@ module PlasticCup
       if style.is_a?(Hash)
         apply_properties(target, style)
       else
-        style_sheet = get_style_sheet(style)
-        unless style_sheet.nil?
-          extends = style_sheet.extends
-          final_style = {}
-          extends.each do |ext|
-            ext_style_sheet = get_style_sheet(ext)
-            final_style.merge!(ext_style_sheet.properties) unless ext_style_sheet.nil?
-          end
-          apply_properties(target, final_style.merge(style_sheet.properties))
-        end
+        apply_properties(target, get_style_sheet_properties(style))
       end
       target
     end
@@ -41,6 +32,24 @@ module PlasticCup
       style_hash
     end
 
+    def self.get_style_sheet_properties(style)
+      style_sheet = get_style_sheet(style)
+      if style_sheet.nil?
+        {}
+      else
+        extends = style_sheet.extends
+        if extends.empty?
+          style_sheet.properties
+        else
+          final_style = {}
+          extends.each do |ext|
+            final_style.merge!(get_style_sheet_properties(ext))
+          end
+          final_style.merge(style_sheet.properties)
+        end
+      end
+    end
+
     # teacup/lib/teacup/handler.rb
     def self.handler(klass, *style_names, &block)
       if style_names.length == 0

data/lib/plastic_cup/version.rb

@@ -1,3 +1,3 @@
 module PlasticCup
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/spec/base_spec.rb

@@ -49,6 +49,30 @@ describe 'PlasticCup::Base' do
       button.tintColor.should == UIColor.greenColor
     end
 
+    it 'should support multiple layer extends' do
+      PlasticCup::Base.add_style_sheet(:grandma, {textAlignment: 2})
+      PlasticCup::Base.add_style_sheet(:mother, {extends: :grandma, placeholder: 'This is placeholder'})
+      PlasticCup::Base.add_style_sheet(:my_style, {extends: :mother, text: 'My Text'})
+
+      field = PlasticCup::Base.style(UITextField.new, :my_style)
+
+      field.textAlignment.should == 2
+      field.text.should == 'My Text'
+      field.placeholder.should == 'This is placeholder'
+    end
+
+    it 'should ignore missing extends style sheet' do
+      PlasticCup::Base.add_style_sheet(:grandma, {textAlignment: 3})
+      PlasticCup::Base.add_style_sheet(:mother, {extends: [:grandma, :nobody], placeholder: 'Mother placeholder'})
+      PlasticCup::Base.add_style_sheet(:my_style, {extends: [:mother, :et], text: 'My Style Text'})
+
+      field = PlasticCup::Base.style(UITextField.new, :my_style)
+
+      field.textAlignment.should == 3
+      field.text.should == 'My Style Text'
+      field.placeholder.should == 'Mother placeholder'
+    end
+
   end
 
   describe '#add_style_sheet and #get_style_sheet' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plastic_cup
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - April Tsang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-09 00:00:00.000000000 Z
+date: 2013-10-10 00:00:00.000000000 Z
 dependencies: []
 description: ! 'Plastic Cup is a simplified version of Teacup, aiming at memory leak
   prevention.