plastic_cup 0.1.2 → 0.1.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDUyY2MzNDVkMGE0N2JhMGIyZmUyNWQ4MzU2MThiMmI5ZjU1MDZkNg==
+    NDg1MzVkMmY1NjhmMjAzNmRlZWU2NmY5MjQ0NDY3YTQ0N2NkOGQxOQ==
   data.tar.gz: !binary |-
-    NDM3MWNhNTc4OTg2M2ZmYzEwMzU2MWQxMjA0MTM3OGIxOGNkOTcwMA==
+    YTE2ZDExNTMxNmUyMGIyOGNiZWRlZmEzNGI2MTI1Mjc3YjhmYjE0Nw==
 SHA512:
   metadata.gz: !binary |-
-    OTQ1N2ZiMDJkMmQ2YzhlNGRmMzlmY2RkOTdjZDIwNDI1NzUxZWQ5MjcxZTJj
-    MTYxMmUyNmM1NzFhNDE3ZGI4MjQ1MGM3OTcyOGZhMDcxMDU3N2JlM2MxMjA1
-    OGY0ZTIyMjE5NDA2NjE1YTIzMmIwMTRlMTRhMWU1ODk2MDFlYTY=
+    NTdiYmJmYjQ1OTIwYmI5ZWZiNzI0Y2Q1ZGQ2ZTE5MDFiZmQ1NjM3MjQ5MDJm
+    YTg2OGE1MGQ3ZmU1YjVmMzBiMTk2MTM2YzgzZjkzYzE0ZTU1MjM1Njg5MDZm
+    ZTk4M2QyN2I0NjlmYmUzNmQ5MmUxM2U0MmM1MzcxNTJhMjFlYmE=
   data.tar.gz: !binary |-
-    Y2FkZDljMjllN2FhM2ZkNTE4OTNjYWQ5OWQ3N2U1YzA2Mzc4NTBlMDY5Nzgy
-    ZTk5MGZiMzU3OWI2NTkxMDU0ZTM1ZDZjNDJmNDY1ZjdjZWY1NjU4MGM3YjM1
-    ZGIzMGMxYjIyMmJiZTNhNDk0OWYzNGY4OWUyNjFiODFiOWU0Mzc=
+    YTBiNDk5ZDU4MWJlYWIxZTViOGZmM2NjNzI1ZWU3NGMwMGE1OWEyY2E2YTc4
+    YzljZDkxOGQxZDFkNDczYjVhNDk4ZDZlNmY1OTRkMWJmZGI2MGE2MTgwNGQ3
+    MWMyMzg5OGJjMjM3MzA0ZjQ4N2EwNzVhZDYzZTM5ZTg4MzBlZTg=

data/Gemfile.lock

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

data/README.md

@@ -22,16 +22,16 @@ PlasticCup::Base.add_style_sheet(:red_button, {
 
 Style with extend Stylesheet
 ```ruby
-PlasticCup::Base.add_style_sheet(:round_button, {
+PlasticCup::Base.add_style_sheet(:round_label, {
   layer: {
     cornerRadius: 8
   }
 })
-PlasticCup::Base.add_style_sheet(:green_button, {
-  extends: :round_button,
+PlasticCup::Base.add_style_sheet(:green_label, {
+  extends: :round_label,
   backgroundColor: UIColor.greenColor
 }
-@button = PlasticCup::Base.style(UIButton.new, :green_button)
+@label = PlasticCup::Base.style(UILabel.new, :green_label)
 ```
 
 Support different iOS versions
@@ -43,7 +43,7 @@ PlasticCup::Base.add_style_sheet(:bg_view, {
 PlasticCup::Base.add_style_sheet(:bg_view, {
   frame: CGRectMake(0, 20, 320, 200)
 }, :ios7)
-# supported symbols: :all, :ios4, :ios5, :ios6, :ios7
+# supported symbols: :all, :ios4, :ios5, :ios6, :ios7, :ios8
 # default is :all
 ```
 

data/lib/plastic_cup/base.rb

@@ -2,15 +2,19 @@ module PlasticCup
 
   class Base
 
-    OSVersions = %w(all ios4 ios5 ios6 ios7)
+    OSVersions = %w(all ios4 ios5 ios6 ios7 ios8)
 
     def self.style(target, style, other_style=nil)
       if style.is_a?(Hash)
         apply_properties(target, style)
-      elsif other_style.is_a?(Hash)
-        apply_properties(target, get_style_sheet_properties(style).merge(other_style))
       else
-        apply_properties(target, get_style_sheet_properties(style))
+        extends = style.is_a?(Array) ? style : [style]
+        final_style = {}
+        extends.each do |ext|
+          final_style.merge!(get_style_sheet_properties(ext))
+        end
+        final_style.merge!(other_style) if other_style.is_a?(Hash)
+        apply_properties(target, final_style)
       end
       target
     end
@@ -106,7 +110,11 @@ module PlasticCup
           # you can send methods to subviews (e.g. UIButton#titleLabel) and CALayers
           # (e.g. UIView#layer) by assigning a hash to a style name.
           if value.is_a?(Hash)
-            apply_properties(target.send(key), value)
+            if target.respondsToSelector(key) || target.respond_to?(key)
+              apply_properties(target.send(key), value)
+            else
+              NSLog "WARNING: undefined method '#{key}' for #{target.inspect}"
+            end
           else
             if key =~ /^set[A-Z]/
               assign = nil

data/lib/plastic_cup/version.rb

@@ -1,3 +1,3 @@
 module PlasticCup
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

data/spec/base_spec.rb

@@ -91,6 +91,17 @@ describe 'PlasticCup::Base' do
       field.text.should == 'My Style Text'
       field.placeholder.should == 'My placeholder'
     end
+
+    it 'should support multiple additional styles' do
+      PlasticCup::Base.add_style_sheet(:father, {backgroundColor: UIColor.blueColor, numberOfLines: 18})
+      PlasticCup::Base.add_style_sheet(:mother, {backgroundColor: UIColor.redColor, textColor: UIColor.greenColor})
+      label = PlasticCup::Base.style(UILabel.new, [:father, :mother], text: 'My label', textColor: UIColor.grayColor)
+
+      label.backgroundColor.should == UIColor.redColor
+      label.numberOfLines.should == 18
+      label.textColor.should == UIColor.grayColor
+      label.text.should == 'My label'
+    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.2
+  version: 0.1.3
 platform: ruby
 authors:
 - April Tsang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-13 00:00:00.000000000 Z
+date: 2015-01-15 00:00:00.000000000 Z
 dependencies: []
 description: ! 'Plastic Cup is a simplified version of Teacup, aiming at memory leak
   prevention.