cytoplasm 0.2.9 → 0.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. data/app/controllers/cytoplasm/fonts_controller.rb +1 -1
  2. data/lib/cytoplasm/version.rb +1 -1
  3. data/test/dummy/Gemfile.lock +7 -7
  4. metadata +3 -3
data/app/controllers/cytoplasm/fonts_controller.rb CHANGED
@@ -87,7 +87,7 @@ module Cytoplasm
87
87
 
88
88
  # Fetch imported GoogleWebFonts fonts
89
89
  yaml = fetch_yaml(@@gwf_file)
90
- yaml["imported"].each {|f| imported["googlewebfonts"][f] = fetch_gwf_family(f)} unless yaml == false or yaml["imported"].nil?
90
+ yaml["imported"].each {|f| imported["googlewebfonts"][f] = fetch_gwf_family(f)} if yaml.is_a? Hash and yaml["imported"]
91
91
 
92
92
  return imported
93
93
  end
data/lib/cytoplasm/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Cytoplasm
2
- VERSION = "0.2.9"
2
+ VERSION = "0.3.0"
3
3
  end
data/test/dummy/Gemfile.lock CHANGED
@@ -37,7 +37,7 @@ GEM
37
37
  coffee-script-source
38
38
  execjs
39
39
  coffee-script-source (1.4.0)
40
- cytoplasm (0.2.2)
40
+ cytoplasm (0.2.9)
41
41
  jquery-rails
42
42
  jquery-ui-rails
43
43
  rails (~> 3.2.9)
@@ -48,10 +48,10 @@ GEM
48
48
  hike (1.2.1)
49
49
  i18n (0.6.1)
50
50
  journey (1.0.4)
51
- jquery-rails (2.2.0)
51
+ jquery-rails (2.2.1)
52
52
  railties (>= 3.0, < 5.0)
53
53
  thor (>= 0.14, < 2.0)
54
- jquery-ui-rails (3.0.1)
54
+ jquery-ui-rails (4.0.1)
55
55
  jquery-rails
56
56
  railties (>= 3.1.0)
57
57
  json (1.7.6)
@@ -59,13 +59,13 @@ GEM
59
59
  i18n (>= 0.4.0)
60
60
  mime-types (~> 1.16)
61
61
  treetop (~> 1.4.8)
62
- mime-types (1.19)
62
+ mime-types (1.20.1)
63
63
  multi_json (1.5.0)
64
64
  polyglot (0.3.3)
65
- rack (1.4.4)
65
+ rack (1.4.5)
66
66
  rack-cache (1.2)
67
67
  rack (>= 0.4)
68
- rack-ssl (1.3.2)
68
+ rack-ssl (1.3.3)
69
69
  rack
70
70
  rack-test (0.6.2)
71
71
  rack (>= 1.0)
@@ -85,7 +85,7 @@ GEM
85
85
  rdoc (~> 3.4)
86
86
  thor (>= 0.14.6, < 2.0)
87
87
  rake (10.0.3)
88
- rdoc (3.12)
88
+ rdoc (3.12.1)
89
89
  json (~> 1.4)
90
90
  rubyzip (0.9.9)
91
91
  sass (3.2.5)
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: cytoplasm
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.9
4
+ version: 0.3.0
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -386,7 +386,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
386
386
  version: '0'
387
387
  segments:
388
388
  - 0
389
- hash: 3541975796973238616
389
+ hash: 648559931027973802
390
390
  required_rubygems_version: !ruby/object:Gem::Requirement
391
391
  none: false
392
392
  requirements:
@@ -395,7 +395,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
395
395
  version: '0'
396
396
  segments:
397
397
  - 0
398
- hash: 3541975796973238616
398
+ hash: 648559931027973802
399
399
  requirements: []
400
400
  rubyforge_project:
401
401
  rubygems_version: 1.8.24