plastic_cup 0.1.1 → 0.1.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTcyZjliNGZhNGY1YmMyZjliNzFiMmE3NTMxZWM4ZmYwMmZhNjNkMA==
+    ZDUyY2MzNDVkMGE0N2JhMGIyZmUyNWQ4MzU2MThiMmI5ZjU1MDZkNg==
   data.tar.gz: !binary |-
-    MTY0Yzc5MjY4NzllMDk4ZjZkMTQyMWQwMzcxMTFiOTkyZThmMDkxNw==
-!binary "U0hBNTEy":
+    NDM3MWNhNTc4OTg2M2ZmYzEwMzU2MWQxMjA0MTM3OGIxOGNkOTcwMA==
+SHA512:
   metadata.gz: !binary |-
-    NzlkODA5MWJmNmFhMDYzNDE3YWRmMTBhMjU5MWZjZWQ3MjgxZDhhNDE0MTNl
-    YmU5MGEzOTI4MDQ3NTExNjgwYWU0YmYwYjQ2MjgyNWJkNTg3MzZkYTdkNjUz
-    N2UxNGEzYjcyODJlODU5ZDIwMzhiZTlkMDNlMzhlYzdmYTRkYzg=
+    OTQ1N2ZiMDJkMmQ2YzhlNGRmMzlmY2RkOTdjZDIwNDI1NzUxZWQ5MjcxZTJj
+    MTYxMmUyNmM1NzFhNDE3ZGI4MjQ1MGM3OTcyOGZhMDcxMDU3N2JlM2MxMjA1
+    OGY0ZTIyMjE5NDA2NjE1YTIzMmIwMTRlMTRhMWU1ODk2MDFlYTY=
   data.tar.gz: !binary |-
-    ODFhMzU2MjcyNmQxOTQ2ODY2ODA4YTc4MTllZDZiOTZjOTEzMjcyYmVhZDkw
-    Yjc3OGUxNTZiZGEzNTZiZmM4NmE3NzhmZjliMjFjOTgxMzdjMGY4OTlkZTA1
-    MDMwZDBlOWFlNDFiZWRjY2U4NTViM2M5MzZhNWE4YWJhYWE3ODM=
+    Y2FkZDljMjllN2FhM2ZkNTE4OTNjYWQ5OWQ3N2U1YzA2Mzc4NTBlMDY5Nzgy
+    ZTk5MGZiMzU3OWI2NTkxMDU0ZTM1ZDZjNDJmNDY1ZjdjZWY1NjU4MGM3YjM1
+    ZGIzMGMxYjIyMmJiZTNhNDk0OWYzNGY4OWUyNjFiODFiOWU0Mzc=

data/Gemfile.lock

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

data/README.md

@@ -17,6 +17,7 @@ PlasticCup::Base.add_style_sheet(:red_button, {
   backgroundColor: UIColor.redColor
 })
 @button = PlasticCup::Base.style(UIButton.new, :red_button)
+@button2 = PlasticCup::Base.style(UIButton.new, :red_button, title: 'Another Red')
 ```
 
 Style with extend Stylesheet

data/lib/plastic_cup/base.rb

@@ -4,9 +4,11 @@ module PlasticCup
 
     OSVersions = %w(all ios4 ios5 ios6 ios7)
 
-    def self.style(target, style)
+    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))
       end

data/lib/plastic_cup/version.rb

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

data/spec/base_spec.rb

@@ -73,6 +73,24 @@ describe 'PlasticCup::Base' do
       field.placeholder.should == 'Mother placeholder'
     end
 
+    it 'should support additional style' do
+      PlasticCup::Base.add_style_sheet(:my_style, {textAlignment: 3})
+
+      field = PlasticCup::Base.style(UITextField.new, :my_style, text: 'My Style Text')
+
+      field.textAlignment.should == 3
+      field.text.should == 'My Style Text'
+    end
+
+    it 'should support additional style overriding style sheet' do
+      PlasticCup::Base.add_style_sheet(:my_style, {textAlignment: 3, placeholder: 'Mother placeholder'})
+
+      field = PlasticCup::Base.style(UITextField.new, :my_style, text: 'My Style Text', placeholder: 'My placeholder')
+
+      field.textAlignment.should == 3
+      field.text.should == 'My Style Text'
+      field.placeholder.should == 'My 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.1
+  version: 0.1.2
 platform: ruby
 authors:
 - April Tsang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-10 00:00:00.000000000 Z
+date: 2014-05-13 00:00:00.000000000 Z
 dependencies: []
 description: ! 'Plastic Cup is a simplified version of Teacup, aiming at memory leak
   prevention.
@@ -61,7 +61,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: A rubymotion gem for assigning properties to object by hash.