cytoplasm 0.3.0 → 0.3.1

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 +7 -11
  2. data/lib/cytoplasm/version.rb +1 -1
  3. data/test/dummy/Gemfile.lock +1 -1
  4. metadata +3 -3
data/app/controllers/cytoplasm/fonts_controller.rb CHANGED
@@ -100,10 +100,12 @@ module Cytoplasm
100
100
 
101
101
  # Check that FontSquirrel fonts actually exist in @@fontsdir
102
102
  notfound = 0
103
- yaml["fontsquirrel"].each do |fam,variants|
104
- unless File.exists?(@@fontsdir+"/"+fam)
105
- yaml["fontsquirrel"].delete(fam)
106
- notfound += 1
103
+ if yaml.is_a? Hash and yaml["imported"]
104
+ yaml["fontsquirrel"].each do |fam,variants|
105
+ unless File.exists?(@@fontsdir+"/"+fam)
106
+ yaml["fontsquirrel"].delete(fam)
107
+ notfound += 1
108
+ end
107
109
  end
108
110
  end
109
111
  if notfound>0
@@ -112,13 +114,7 @@ module Cytoplasm
112
114
  end
113
115
 
114
116
  # Fetch enabled fonts lists
115
- ["fontsquirrel","googlewebfonts"].each do |dir|
116
- unless yaml[dir].nil?
117
- yaml[dir].each do |fam,variants|
118
- enabled[dir][fam] = fetch_family(dir,fam)
119
- end
120
- end
121
- end
117
+ ["fontsquirrel","googlewebfonts"].each {|dir| yaml[dir].each {|fam,variants| enabled[dir][fam] = fetch_family(dir,fam)} if yaml.is_a? Hash and yaml[dir]}
122
118
 
123
119
  return enabled
124
120
  end
data/lib/cytoplasm/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Cytoplasm
2
- VERSION = "0.3.0"
2
+ VERSION = "0.3.1"
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.9)
40
+ cytoplasm (0.3.0)
41
41
  jquery-rails
42
42
  jquery-ui-rails
43
43
  rails (~> 3.2.9)
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.3.0
4
+ version: 0.3.1
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: 648559931027973802
389
+ hash: -3254516121215688554
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: 648559931027973802
398
+ hash: -3254516121215688554
399
399
  requirements: []
400
400
  rubyforge_project:
401
401
  rubygems_version: 1.8.24