designmodo-flatuipro-rails 1.2.5.0.branch → 1.3.0.0.branch

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 (8) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +19 -4
  3. data/lib/designmodo/flatuipro/rails/version.rb +1 -1
  4. data/lib/generators/flatuipro/demo/demo_generator.rb +6 -6
  5. data/lib/generators/flatuipro/install/install_generator.rb +71 -55
  6. data/lib/generators/flatuipro/install/templates/flatuipro.js +9 -6
  7. data/lib/generators/flatuipro/install/templates/flatuipro.less +1 -1
  8. metadata +21 -21
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 4269d9c16fa1ad88d5caffdd6ffde40eb609dd83
4
- data.tar.gz: 272ba8248dbcc18c0bec4dab6b0d72dab137b6e8
3
+ metadata.gz: 226bdffa5990dab8117ff3f279077ad2d949fccf
4
+ data.tar.gz: db51958afdef10b408c8ae4c54531c0130dd4075
5
5
  SHA512:
6
- metadata.gz: 66d8d1bc25e5a7e784cdad25c46b6d02455bfce92a5330014a656e4088bb920c91dc4c14e8a3dc0a02f6800a0ea12444553f49ed64a6c21ea91745781290ec24
7
- data.tar.gz: 1de3357bc2862b790a9f4f01d732c650f68cdea895c26cfa08141cf6a715bbd0d0c1a9c82752ffad98837df2edcf84945cac72a155e98dfe061de34fd16069b5
6
+ metadata.gz: 3abc9093e81cfa19b2bf345cf8cd8fcd82275bf8631aa759e3a94fb36b989fded22dad935d84c838ca289e8343ef8c801eb01ca878f0718bb925cce4ecc2dae0
7
+ data.tar.gz: 07819f2e1c4c1ec4cd7cb2b77a93fcfd86c7a9870096b263b74b0c30bbdeb583752fb81bf11dd2215c3ecb55756d8fac7a413f4ef965e2a687ad5c9f9cb95a19
data/README.md CHANGED
@@ -11,7 +11,7 @@ First install and configure dependencies: [less-rails-bootstrap](https://github.
11
11
 
12
12
  Add this line to your application's Gemfile:
13
13
 
14
- gem 'designmodo-flatuipro-rails', '~> 1.2.4.0.branch'
14
+ gem 'designmodo-flatuipro-rails', '~> 1.3.0.0.branch'
15
15
 
16
16
  And then execute:
17
17
 
@@ -19,7 +19,10 @@ And then execute:
19
19
 
20
20
  Or install it yourself as:
21
21
 
22
- $ gem install designmodo-flatuipro-rails -v 1.2.4.0.branch
22
+ $ gem install designmodo-flatuipro-rails -v 1.3.0.0.branch
23
+
24
+ ### Fetch Flat UI Pro JS dependencies via Bower
25
+ Install [Bower](http://bower.io). Run 'bower install' in the Flat UI Pro directory that contains the bower.json file.
23
26
 
24
27
  ### Install Generator
25
28
  One **must** run this after install *and* after update of designmodo-flatuipro-rails gem:
@@ -33,7 +36,7 @@ If you want to integrate the demo page:
33
36
 
34
37
  The demo generator creates a 'flatuipro\_demo' controller with a default 'flatuipro\_demo/index' route.
35
38
 
36
- IMPORTANT: After deciding which components to use from the demo page, make sure to only include the corresponding less/css and js that you need from the flatuipro-demo.* files
39
+ IMPORTANT: After deciding which components to use from the demo page, make sure to only include the what you need from the docs.js and docs.less demo files
37
40
 
38
41
  ## Usage
39
42
  After running the install generator, all assets should be setup.
@@ -44,6 +47,18 @@ If you haven't bought it already, please use my Designmodo Affiliate Link (image
44
47
  Thanks [@jehughes](https://github.com/jehughes) for the blog post that inspired me to stop being lazy and write the demo page generator =)
45
48
 
46
49
  ## Changes
50
+ #### 1.3.0.0.branch
51
+ * Detect Flat-UI-Pro-1.3.0 directory
52
+ * Flat UI Pro 1.3.0 changes
53
+ * JS dependencies no longer bundled so users now have to fetch them first via Bower
54
+ * Lots of directory and file name changes
55
+
56
+ #### 1.2.5.0.branch
57
+ * Detect Flat-UI-Pro-1.2.5 directory
58
+ * Flat UI Pro 1.2.5 changes
59
+ * Font and icon paths changed to annoying string interpolation. Less-rails requires *-url helpers for digests
60
+ * Fix Flat UI Pro caret.less syntax error when precompiling
61
+
47
62
  #### 1.2.4.0.branch
48
63
  * Detect Flat-UI-Pro-1.2.4 directory
49
64
  * Change bootstrap 3 rails gem dependency from bootstrap-on-rails -> less-rails-bootstrap
@@ -65,4 +80,4 @@ Thanks [@jehughes](https://github.com/jehughes) for the blog post that inspired
65
80
  2. Create your feature branch (`git checkout -b my-new-feature`)
66
81
  3. Commit your changes (`git commit -am 'Add some feature'`)
67
82
  4. Push to the branch (`git push origin my-new-feature`)
68
- 5. Create new Pull Request
83
+ 5. Create new Pull Request
data/lib/designmodo/flatuipro/rails/version.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  module Designmodo
2
2
  module Flatuipro
3
3
  module Rails
4
- VERSION = "1.2.5.0.branch"
4
+ VERSION = "1.3.0.0.branch"
5
5
  end
6
6
  end
7
7
  end
data/lib/generators/flatuipro/demo/demo_generator.rb CHANGED
@@ -23,30 +23,30 @@ module Flatuipro
23
23
  copy_file "index.html.erb", "app/views/flatuipro_demo/index.html.erb"
24
24
 
25
25
  # Add demo LESS
26
- copy_file "flatuipro-demo.less", "app/assets/stylesheets/flatuipro-demo.less"
27
-
26
+ copy_file "docs.less", "app/assets/stylesheets/docs.less"
27
+
28
28
  # Handle CSS Manifest
29
29
  css_manifest = "app/assets/stylesheets/application.css"
30
30
  if File.exist?(css_manifest)
31
31
  content = File.read(css_manifest)
32
32
  unless content.match(/require_tree\s+\./)
33
- style_require_block = " *= require flatuipro-demo\n"
33
+ style_require_block = " *= require docs\n"
34
34
  insert_into_file css_manifest, style_require_block, :after => "require_self\n"
35
35
  end
36
36
  end
37
37
 
38
38
  # Add demo javascript
39
- copy_file "flatuipro-demo.js", "app/assets/javascripts/flatuipro-demo.js"
39
+ copy_file "docs.js", "app/assets/javascripts/docs.js"
40
40
 
41
41
  # Handle JS Manifest
42
42
  js_manifest = "app/assets/javascripts/application.js"
43
43
  if File.exist?(js_manifest)
44
44
  content = File.read(js_manifest)
45
45
  unless content.match(/require_tree\s+\./)
46
- insert_into_file js_manifest, "//= require flatuipro-demo\n", :after => "flatuipro\n"
46
+ insert_into_file js_manifest, "//= require application-docs\n", :after => "flatuipro\n"
47
47
  end
48
48
  end
49
49
  end
50
50
  end
51
51
  end
52
- end
52
+ end
data/lib/generators/flatuipro/install/install_generator.rb CHANGED
@@ -15,22 +15,37 @@ module Flatuipro
15
15
  unless File.exist?(File.join(pro_dir, "index.html"))
16
16
  pro_dir = File.join(pro_dir, "HTML/UI")
17
17
  end
18
- if File.directory?(File.join(pro_dir, "Flat-UI-Pro-1.2.5"))
19
- pro_dir = File.join(pro_dir, "Flat-UI-Pro-1.2.5")
18
+ if File.directory?(File.join(pro_dir, "Flat-UI-Pro-1.3.0"))
19
+ pro_dir = File.join(pro_dir, "Flat-UI-Pro-1.3.0")
20
20
  end
21
- unless File.directory?(pro_dir) && File.exist?(File.join(pro_dir, "index.html"))
21
+ unless File.exist?(File.join(pro_dir, "docs/index.html"))
22
22
  raise "Invalid Flat UI Pro directory"
23
23
  end
24
+ unless File.directory?(File.join(pro_dir, "bower_components"))
25
+ raise "'bower install' must be run first to fetch javascript dependencies"
26
+ end
27
+
24
28
 
25
- directory File.join(pro_dir, "less"), File.join(gem_assets_dir, "less")
26
- directory File.join(pro_dir, "js"), File.join(gem_assets_dir, "javascripts")
27
- directory File.join(pro_dir, "images"), File.join(gem_assets_dir, "images")
28
- directory File.join(pro_dir, "fonts"), File.join(gem_assets_dir, "fonts")
29
+ directory File.join(pro_dir, "js"), File.join(gem_assets_dir, "javascripts")
30
+ copy_file File.join(pro_dir, "bower_components/bootstrap-switch/dist/js/bootstrap-switch.js"), File.join(gem_assets_dir, "javascripts/bootstrap-switch.js")
31
+ copy_file File.join(pro_dir, "bower_components/bootstrap-tagsinput/dist/bootstrap-tagsinput.js"), File.join(gem_assets_dir, "javascripts/bootstrap-tagsinput.js")
32
+ copy_file File.join(pro_dir, "bower_components/holderjs/holder.js"), File.join(gem_assets_dir, "javascripts/holder.js")
33
+ copy_file File.join(pro_dir, "bower_components/jquery-placeholder/jquery.placeholder.js"), File.join(gem_assets_dir, "javascripts/jquery.placeholder.js")
34
+ copy_file File.join(pro_dir, "bower_components/jquery-ui-touch-punch/jquery.ui.touch-punch.js"), File.join(gem_assets_dir, "javascripts/jquery.ui.touch-punch.js")
35
+ copy_file File.join(pro_dir, "bower_components/respond/dest/respond.src.js"), File.join(gem_assets_dir, "javascripts/respond.js")
36
+ copy_file File.join(pro_dir, "bower_components/select2/select2.js"), File.join(gem_assets_dir, "javascripts/select2.js")
37
+ copy_file File.join(pro_dir, "bower_components/typeahead.js/dist/typeahead.bundle.js"), File.join(gem_assets_dir, "javascripts/typeahead.bundle.js")
38
+ copy_file File.join(pro_dir, "bower_components/videojs/dist/video-js/video.js"), File.join(gem_assets_dir, "javascripts/video.js")
39
+
40
+ directory File.join(pro_dir, "less"), File.join(gem_assets_dir, "less")
41
+ directory File.join(pro_dir, "fonts"), File.join(gem_assets_dir, "fonts")
42
+ directory File.join(pro_dir, "docs/assets/img"), File.join(gem_assets_dir, "images")
29
43
 
30
44
  # Demo page assets
31
- copy_file File.join(pro_dir, "index.html"), File.join(gem_assets_dir, "demo", "index.html")
32
- copy_file File.join(pro_dir, "js", "application.js"), File.join(gem_assets_dir, "demo", "flatuipro-demo.js")
33
- copy_file File.join(pro_dir, "less", "demo.less"), File.join(gem_assets_dir, "demo", "flatuipro-demo.less")
45
+ copy_file File.join(pro_dir, "docs/index.html"), File.join(gem_assets_dir, "demo", "index.html")
46
+ copy_file File.join(pro_dir, "docs/assets/css/src/docs.less"), File.join(gem_assets_dir, "demo", "docs.less")
47
+ copy_file File.join(pro_dir, "docs/assets/css/src/prettyprint.less"), File.join(gem_assets_dir, "demo", "prettyprint.less")
48
+ copy_file File.join(pro_dir, "docs/assets/js/application-docs.js"), File.join(gem_assets_dir, "demo", "docs.js")
34
49
  end
35
50
 
36
51
  def add_assets
@@ -44,25 +59,23 @@ module Flatuipro
44
59
  unless content.match(/require\s+flatuipro/)
45
60
  insert_into_file js_manifest, "//= require flatuipro\n", :after => "jquery\n"
46
61
  end
47
- unless content.match(/require\s+jquery.ui.all/)
48
- unless content.match(/require\s+jquery.ui.effect/)
49
- insert_into_file js_manifest, "//= require jquery.ui.effect\n", :after => "jquery\n"
50
- end
51
- unless content.match(/require\s+jquery.ui.tooltip/)
52
- insert_into_file js_manifest, "//= require jquery.ui.tooltip\n", :after => "jquery\n"
53
- end
54
- unless content.match(/require\s+jquery.ui.spinner/)
55
- insert_into_file js_manifest, "//= require jquery.ui.spinner\n", :after => "jquery\n"
56
- end
57
- unless content.match(/require\s+jquery.ui.slider/)
58
- insert_into_file js_manifest, "//= require jquery.ui.slider\n", :after => "jquery\n"
59
- end
60
- unless content.match(/require\s+jquery.ui.datepicker/)
61
- insert_into_file js_manifest, "//= require jquery.ui.datepicker\n", :after => "jquery\n"
62
- end
63
- unless content.match(/require\s+jquery.ui.button/)
64
- insert_into_file js_manifest, "//= require jquery.ui.button\n", :after => "jquery\n"
65
- end
62
+ unless content.match(/require\s+jquery-ui\/effect/)
63
+ insert_into_file js_manifest, "//= require jquery-ui/effect\n", :after => "jquery\n"
64
+ end
65
+ unless content.match(/require\s+jquery-ui\/tooltip/)
66
+ insert_into_file js_manifest, "//= require jquery-ui/tooltip\n", :after => "jquery\n"
67
+ end
68
+ unless content.match(/require\s+jquery-ui\/spinner/)
69
+ insert_into_file js_manifest, "//= require jquery-ui/spinner\n", :after => "jquery\n"
70
+ end
71
+ unless content.match(/require\s+jquery-ui\/slider/)
72
+ insert_into_file js_manifest, "//= require jquery-ui/slider\n", :after => "jquery\n"
73
+ end
74
+ unless content.match(/require\s+jquery-ui\/datepicker/)
75
+ insert_into_file js_manifest, "//= require jquery-ui/datepicker\n", :after => "jquery\n"
76
+ end
77
+ unless content.match(/require\s+jquery-ui\/button/)
78
+ insert_into_file js_manifest, "//= require jquery-ui/button\n", :after => "jquery\n"
66
79
  end
67
80
  else
68
81
  copy_file "application.js", js_manifest
@@ -85,44 +98,47 @@ module Flatuipro
85
98
  gem_assets_dir = File.expand_path("../../../../../app/assets", __FILE__)
86
99
 
87
100
  # LESS patches
88
- # switch.less
89
- # More involved patch because less-rails won't translate when inside ~""
90
- # Create LESS variable and interpolate into .mask(~"")
91
- switch_file = File.join(gem_assets_dir, "less/modules", "switch.less")
92
- mask_image_url = "@mask-image-url: image-url('switch/mask.png');\n"
93
- insert_into_file switch_file, mask_image_url, :before => ".has-switch {"
94
- gsub_file switch_file, /url\('\.\.\/images\/.+?\)/, "@{mask-image-url}"
95
-
101
+ # # switch.less
102
+ # # More involved patch because less-rails won't translate when inside ~""
103
+ # # Create LESS variable and interpolate into .mask(~"")
104
+ # switch_file = File.join(gem_assets_dir, "less/modules", "switch.less")
105
+ # mask_image_url = "@mask-image-url: image-url('switch/mask.png');\n"
106
+ # insert_into_file switch_file, mask_image_url, :before => ".has-switch {"
107
+ # gsub_file switch_file, /url\('\.\.\/images\/.+?\)/, "@{mask-image-url}"
108
+ #
96
109
  # variables.less
97
- gsub_file File.join(gem_assets_dir, "less", "variables.less"), /"..\/fonts\/lato\/"/, '"lato/"'
98
- gsub_file File.join(gem_assets_dir, "less", "variables.less"), /"..\/fonts\/"/, '""'
110
+ gsub_file File.join(gem_assets_dir, "less/variables.less"), /..\/fonts\//, ""
99
111
 
100
112
  # local-fonts.less
101
- gsub_file(File.join(gem_assets_dir, "less/modules", "local-fonts.less"), /~"url.+?"/) { |match|
102
- match[2..-2].sub(/url\('(.+?)'\)/, "font-url('\\1')")
103
- }
113
+ gsub_file File.join(gem_assets_dir, "less/modules/local-fonts.less"), "url", "font-url"
104
114
 
105
115
  # glyphicons.less
106
- gsub_file(File.join(gem_assets_dir, "less/modules", "glyphicons.less"), /~"url.+?"/) { |match|
107
- match[2..-2].sub(/url\('(.+?)'\)/, "font-url('\\1')")
108
- }
109
-
110
- # Fix syntax error when precompiling assets
111
- gsub_file File.join(gem_assets_dir, "less/modules", "caret.less"), ".scale(1.001);", "//.scale(1.001);"
112
-
113
- # Demo page patches
116
+ gsub_file File.join(gem_assets_dir, "less/modules/glyphicons.less"), "url", "font-url"
117
+
118
+ # # Fix syntax error when precompiling assets
119
+ # gsub_file File.join(gem_assets_dir, "less/modules", "caret.less"), ".scale(1.001);", "//.scale(1.001);"
120
+
121
+ # Demo Image Rename
122
+ # Designmodo designers - google<space>.svg? Really? And having it correct in index.html? For shame
123
+ link_file File.join(gem_assets_dir, "images/icons/google .svg"), File.join(gem_assets_dir, "images/icons/google.svg")
124
+
125
+ # Demo LESS patches
126
+ gsub_file File.join(gem_assets_dir, "demo", "docs.less"), "..\/..\/..\/..\/less\/", ""
127
+
128
+ # Demo HTML patches
114
129
  file = File.join(gem_assets_dir, "demo", "index.html")
130
+
115
131
  # Fix image links
116
- gsub_file file, /<img src="images\/.+?>/ do |s|
117
- match = /images\/(.+?)"/.match(s)
132
+ gsub_file file, /<img src="assets\/.+?>/ do |s|
133
+ match = /assets\/img\/(.+?)"/.match(s)
118
134
  '<%= image_tag "' + match[1] + '" %>'
119
135
  end
120
136
 
121
- # Remove everything before <body> tag and after 'Load JS', inclusive
137
+ # Remove everything before <body> tag and after 'jQuery', inclusive
122
138
  new_file = File.open("#{file}.erb", "w")
123
139
  include_line = false
124
140
  IO.foreach(file) do |line|
125
- include_line = false if line =~ /Load JS/
141
+ include_line = false if line =~ /jQuery/
126
142
 
127
143
  new_file.write line if include_line
128
144
 
@@ -132,4 +148,4 @@ module Flatuipro
132
148
  end
133
149
  end
134
150
  end
135
- end
151
+ end
data/lib/generators/flatuipro/install/templates/flatuipro.js CHANGED
@@ -1,8 +1,11 @@
1
- //= require jquery.ui.touch-punch.min
2
- //= require bootstrap-select
1
+ //= require fileinput
2
+ //= require radiocheck
3
3
  //= require bootstrap-switch
4
- //= require flatui-checkbox
5
- //= require flatui-radio
6
- //= require jquery.tagsinput
4
+ //= require bootstrap-tagsinput
5
+ //= require holder
7
6
  //= require jquery.placeholder
8
- //= require typeahead
7
+ //= require jquery.ui.touch-punch
8
+ //= require respond
9
+ //= require select2
10
+ //= require typeahead.bundle
11
+ //= require video
data/lib/generators/flatuipro/install/templates/flatuipro.less CHANGED
@@ -1 +1 @@
1
- @import "flat-ui";
1
+ @import "flat-ui-pro";
metadata CHANGED
@@ -1,57 +1,57 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: designmodo-flatuipro-rails
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2.5.0.branch
4
+ version: 1.3.0.0.branch
5
5
  platform: ruby
6
6
  authors:
7
7
  - Samuel Chou
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-02-08 00:00:00.000000000 Z
11
+ date: 2014-09-04 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: less-rails-bootstrap
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - '>='
17
+ - - ">="
18
18
  - !ruby/object:Gem::Version
19
- version: '0'
19
+ version: 3.2.0
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - '>='
24
+ - - ">="
25
25
  - !ruby/object:Gem::Version
26
- version: '0'
26
+ version: 3.2.0
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: jquery-rails
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - '>='
31
+ - - ">="
32
32
  - !ruby/object:Gem::Version
33
- version: 2.2.1
33
+ version: 3.1.1
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - '>='
38
+ - - ">="
39
39
  - !ruby/object:Gem::Version
40
- version: 2.2.1
40
+ version: 3.1.1
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: jquery-ui-rails
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - '>='
45
+ - - ">="
46
46
  - !ruby/object:Gem::Version
47
- version: 4.0.3
47
+ version: 5.0.0
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
- - - '>='
52
+ - - ">="
53
53
  - !ruby/object:Gem::Version
54
- version: 4.0.3
54
+ version: 5.0.0
55
55
  description: designmodo-flatuipro-rails integrates Flat UI Pro for Rails 3 and 4 Asset
56
56
  Pipelines
57
57
  email:
@@ -60,17 +60,17 @@ executables: []
60
60
  extensions: []
61
61
  extra_rdoc_files: []
62
62
  files:
63
- - lib/designmodo/flatuipro/rails/version.rb
63
+ - LICENSE.txt
64
+ - README.md
65
+ - Rakefile
64
66
  - lib/designmodo/flatuipro/rails.rb
67
+ - lib/designmodo/flatuipro/rails/version.rb
65
68
  - lib/generators/flatuipro/demo/demo_generator.rb
66
69
  - lib/generators/flatuipro/install/install_generator.rb
67
70
  - lib/generators/flatuipro/install/templates/application.css
68
71
  - lib/generators/flatuipro/install/templates/application.js
69
72
  - lib/generators/flatuipro/install/templates/flatuipro.js
70
73
  - lib/generators/flatuipro/install/templates/flatuipro.less
71
- - LICENSE.txt
72
- - Rakefile
73
- - README.md
74
74
  homepage: https://github.com/reflection/designmodo-flatuipro-rails
75
75
  licenses:
76
76
  - Simplified BSD
@@ -87,17 +87,17 @@ require_paths:
87
87
  - lib
88
88
  required_ruby_version: !ruby/object:Gem::Requirement
89
89
  requirements:
90
- - - '>='
90
+ - - ">="
91
91
  - !ruby/object:Gem::Version
92
92
  version: '0'
93
93
  required_rubygems_version: !ruby/object:Gem::Requirement
94
94
  requirements:
95
- - - '>'
95
+ - - ">"
96
96
  - !ruby/object:Gem::Version
97
97
  version: 1.3.1
98
98
  requirements: []
99
99
  rubyforge_project:
100
- rubygems_version: 2.0.3
100
+ rubygems_version: 2.2.2
101
101
  signing_key:
102
102
  specification_version: 4
103
103
  summary: Flat UI Pro for Rails 3 and 4 Asset Pipelines