designmodo-flatuipro-rails 1.1.4.2 → 1.2.1.0.branch

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87ba87346b114aae8a8c31cee70e73be0255f4e8
-  data.tar.gz: 6cdeec3ccda01a63d185e8fd26ed59e894d0cb09
+  metadata.gz: b5b87a271efd82e2ab9d52fcbbfc625627c0986e
+  data.tar.gz: e538c8e83c68a4a1fa9285bca17564686c660cc7
 SHA512:
-  metadata.gz: c9e3c5972411c520c9b010226ace6a9f04dd2b1adf0828135218e8886f6b89fb7f6e6dc4bbd03d326a4dba531ee2b6ea9f17f5edf213618e6d8f8f34a6a9b267
-  data.tar.gz: 6fb55c131736de2d33941103344d9c0b86ac7a91e5eabd9da467d3477d89c8692d57921108f52c8f17ba5ed5c0e9daea3cd1c9033f5276eb29341c669dec07c2
+  metadata.gz: 696518f41a69eb36ce7af6741db4559f8d16194a10374797f0479fb1de8996e0d6e893a29ed8fb57299f3e576ce7c34c5c2b0a937afd84224f9766d5a87701ff
+  data.tar.gz: 55bdc8475183403d9823b7f8aaa7ea21c1477db92c836f8ba063f8a4019255b20e3c85b56cad8d8dcf00b76b22def744608239f4c3b4f9265a495b2499fff5ef

data/README.md

@@ -1,19 +1,17 @@
 <a href="http://designmodo.com/shop/?u=223" target="_blank"><img src="http://designmodo.com/img/affiliate/flatui_468_60.jpg" border="0"/></a>
 
-This gem integrates Designmodo's Flat UI Pro Design for Twitter Bootstrap 2 into the Rails 3 and 4 Asset Pipeline.
-
-For Twitter Bootstrap 3, see _flatuipro-1.2_ branch.
+This gem integrates Designmodo's Flat UI Pro Design for Twitter Bootstrap 3 into the Rails 3 and 4 Asset Pipeline.
 
 You **must** purchase and download a licensed copy to use this gem (none of the assets are packaged per Flat UI Pro license).  You may do so by clicking the above image (full disclosure: affiliate link).
 
 The version major and minors should match the Flat UI Pro version.  Anything after these are gem versions.
 
 ## Installation
-First install and configure dependencies: [twitter-bootstrap-rails](https://github.com/seyhunak/twitter-bootstrap-rails) and [jquery-ui-rails](https://github.com/joliss/jquery-ui-rails) .
+First install and configure dependencies: [bootstrap-on-rails](https://github.com/jasontorres/bootstrap-on-rails) and [jquery-ui-rails](https://github.com/joliss/jquery-ui-rails) .
 
 Add this line to your application's Gemfile:
 
-    gem 'designmodo-flatuipro-rails'
+    gem 'designmodo-flatuipro-rails', '~> 1.2.1.0.branch'
 
 And then execute:
 
@@ -40,38 +38,15 @@ IMPORTANT: After deciding which components to use from the demo page, make sure
 ## Usage
 After running the install generator, all assets should be setup.
 
-This gem will detect whether you chose less/static for the twitter-bootstrap-rails install and generate either less/css flatuipro files accordingly.
-
 ## Thanks
 If you haven't bought it already, please use my Designmodo Affiliate Link (image above)
 
 Thanks [@jehughes](https://github.com/jehughes) for the blog post that inspired me to stop being lazy and write the demo page generator =)
 
 ## Changes
-#### 1.1.4.2
-* Add missing jquery.ui.button dependency
-
-#### 1.1.4.1
-* Remove accidentally committed debugging statement
-
-#### 1.1.4.0
-* Support Flat UI Pro 1.1.4
-* Detect nested Flat-UI-Pro-1.1.4 directory (in Flat UI Pro 1.2.1 download)
-* Bootstrap 2 only (upcoming 'flatuipro-1.2' branch for Bootstrap 3 version)
-
-#### 1.1.3.1
-* Move directory from vendor -> app because of rails 4 (https://github.com/rails/rails/pull/7968)
-* Ensure all assets are precompiled correctly if so desired
-
-#### 1.1.3.0
-* Support Flat UI Pro 1.1.3
-* Add new 'flatuipro:demo' generator to integrate demo page
-
-#### 1.1.1
-* Minor documentation changes to include Rails 4 compatibility
-
-#### 1.1.0
-* Initial commit
+#### 1.2.1.0.branch
+* Git branch (flatuipro-1.2) and gem release for people who want to use Bootstrap 3
+* Rails bootstrap gem changed: _twitter-bootstrap-rails_ -> _bootstrap-on-rails_
 
 ## Contributing
 

data/lib/designmodo/flatuipro/rails/version.rb

@@ -1,7 +1,7 @@
 module Designmodo
   module Flatuipro
     module Rails
-      VERSION = "1.1.4.2"
+      VERSION = "1.2.1.0.branch"
     end
   end
 end

data/lib/generators/flatuipro/demo/demo_generator.rb

@@ -22,13 +22,9 @@ module Flatuipro
         # Overwrite generated index.html.erb with demo html
         copy_file "index.html.erb", "app/views/flatuipro_demo/index.html.erb"
 
-        # Add demo less/css
-        if use_less?
-          copy_file "flatuipro-demo.less", "app/assets/stylesheets/flatuipro-demo.less"
-        else
-          copy_file "flatuipro-demo.css", "app/assets/stylesheets/flatuipro-demo.css"
-        end
-
+        # Add demo LESS
+        copy_file "flatuipro-demo.less", "app/assets/stylesheets/flatuipro-demo.less"
+        
         # Handle CSS Manifest
         css_manifest = "app/assets/stylesheets/application.css"
         if File.exist?(css_manifest)
@@ -51,18 +47,6 @@ module Flatuipro
           end
         end
       end
-
-      private
-        # Detect if twitter-bootstrap-rails installed with LESS or static stylesheets
-        def use_less?
-          if File.exist?("app/assets/stylesheets/bootstrap_and_overrides.css.less")
-            return true
-          elsif File.exist?("app/assets/stylesheets/bootstrap_and_overrides.css")
-            return false
-          else
-            raise "Cannot detect twitter-bootstrap-rails install"
-          end
-        end
     end
   end
 end

data/lib/generators/flatuipro/install/install_generator.rb

@@ -15,41 +15,34 @@ module Flatuipro
         unless File.exist?(File.join(pro_dir, "index.html"))
           pro_dir = File.join(pro_dir, "HTML/UI")
         end
-        if File.directory?(File.join(pro_dir, "Flat-UI-Pro-1.1.4"))
-          pro_dir = File.join(pro_dir, "Flat-UI-Pro-1.1.4")
+        if File.directory?(File.join(pro_dir, "Flat-UI-Pro-1.2.1"))
+          pro_dir = File.join(pro_dir, "Flat-UI-Pro-1.2.1")
         end
         unless File.directory?(pro_dir) && File.exist?(File.join(pro_dir, "index.html"))
           raise "Invalid Flat UI Pro directory"
         end
 
-        if use_less?
-          directory File.join(pro_dir, "less"), File.join(gem_assets_dir, "less")
-        else
-          copy_file File.join(pro_dir, "css", "flat-ui.css"), "app/assets/stylesheets/flat-ui.css"
-        end
-        directory File.join(pro_dir, "js"),                   File.join(gem_assets_dir, "javascripts")
-        directory File.join(pro_dir, "images"),               File.join(gem_assets_dir, "images")
-        directory File.join(pro_dir, "fonts"),                File.join(gem_assets_dir, "fonts")
+        directory File.join(pro_dir, "less"),   File.join(gem_assets_dir, "less")
+        directory File.join(pro_dir, "js"),     File.join(gem_assets_dir, "javascripts")
+        directory File.join(pro_dir, "images"), File.join(gem_assets_dir, "images")
+        directory File.join(pro_dir, "fonts"),  File.join(gem_assets_dir, "fonts")
 
         # Demo page assets
         copy_file File.join(pro_dir, "index.html"),           File.join(gem_assets_dir, "demo", "index.html")
         copy_file File.join(pro_dir, "js", "application.js"), File.join(gem_assets_dir, "demo", "flatuipro-demo.js")
-        copy_file File.join(pro_dir, "css", "demo.css"),      File.join(gem_assets_dir, "demo", "flatuipro-demo.css")
         copy_file File.join(pro_dir, "less", "demo.less"),    File.join(gem_assets_dir, "demo", "flatuipro-demo.less")
       end
 
       def add_assets
         copy_file "flatuipro.js",   "app/assets/javascripts/flatuipro.js"
-        if use_less?
-          copy_file "flatuipro.less", "app/assets/stylesheets/flatuipro.less"
-        end
+        copy_file "flatuipro.less", "app/assets/stylesheets/flatuipro.less"
 
         # Handle JS Manifest
         js_manifest = "app/assets/javascripts/application.js"
         if File.exist?(js_manifest)
           content = File.read(js_manifest)
           unless content.match(/require\s+flatuipro/)
-            insert_into_file js_manifest, "//= require flatuipro\n", :after => "twitter/bootstrap\n"
+            insert_into_file js_manifest, "//= require flatuipro\n", :after => "jquery\n"
           end
           unless content.match(/require\s+jquery.ui.all/)
             unless content.match(/require\s+jquery.ui.effect/)
@@ -91,27 +84,21 @@ module Flatuipro
       def patch_assets
         gem_assets_dir = File.expand_path("../../../../../app/assets", __FILE__)
 
-        # Stylesheets patches
-        # image url() -> image-url()
-        # font  url() -> font-url()
-        # LESS
-        if use_less?
-          # switch.less
-          # More involved patch because less-rails won't translate when inside ~""
-          # Create LESS variable and interpolate into .mask(~"")
-          switch_file = File.join(gem_assets_dir, "less/modules", "switch.less")
-          mask_image_url = "@mask-image-url: image-url('switch/mask.png');\n"
-          insert_into_file switch_file, mask_image_url, :before => ".has-switch {\n"
-          gsub_file switch_file, /url\('\.\.\/images\/.+?\)/, "@{mask-image-url}"
-
-          # icon-font.less
-          gsub_file File.join(gem_assets_dir, "less", "icon-font.less"), /url\("\.\.\/fonts\//, 'font-url("'
-        # CSS
-        else
-          gsub_file "app/assets/stylesheets/flat-ui.css", /url\('\.\.\/images\//, "url('/assets/"
-          gsub_file "app/assets/stylesheets/flat-ui.css", /url\("\.\.\/fonts\//, 'url("/assets/'
-        end
-
+        # LESS patches
+        # switch.less
+        # More involved patch because less-rails won't translate when inside ~""
+        # Create LESS variable and interpolate into .mask(~"")
+        switch_file = File.join(gem_assets_dir, "less/modules", "switch.less")
+        mask_image_url = "@mask-image-url: image-url('switch/mask.png');\n"
+        insert_into_file switch_file, mask_image_url, :before => ".has-switch {\n"
+        gsub_file switch_file, /url\('\.\.\/images\/.+?\)/, "@{mask-image-url}"
+
+        # icon-font.less
+        gsub_file File.join(gem_assets_dir, "less", "icon-font.less"), /url\("\.\.\/fonts\//, 'font-url("'
+
+        # font.less
+        gsub_file File.join(gem_assets_dir, "less", "fonts.less"), /url\('\.\.\/fonts\//, "font-url('"
+        
         # Demo page patches
         file = File.join(gem_assets_dir, "demo", "index.html")
         # Fix image links
@@ -132,18 +119,6 @@ module Flatuipro
         end
         new_file.close
       end
-
-      private
-        # Detect if twitter-bootstrap-rails installed with LESS or static stylesheets
-        def use_less?
-          if File.exist?("app/assets/stylesheets/bootstrap_and_overrides.css.less")
-            return true
-          elsif File.exist?("app/assets/stylesheets/bootstrap_and_overrides.css")
-            return false
-          else
-            raise "Cannot detect twitter-bootstrap-rails install"
-          end
-        end
     end
   end
 end

data/lib/generators/flatuipro/install/templates/application.js

@@ -5,10 +5,10 @@
 // or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
 //
 // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// the compiled file.
+// compiled file.
 //
-// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
-// GO AFTER THE REQUIRES BELOW.
+// Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
+// about supported directives.
 //
 //= require jquery
 //= require jquery.ui.button
@@ -18,6 +18,18 @@
 //= require jquery.ui.tooltip.js
 //= require jquery.ui.effect.js
 //= require jquery_ujs
-//= require twitter/bootstrap
 //= require flatuipro
+//= require turbolinks
+//= require bootstrap/affix
+//= require bootstrap/alert
+//= require bootstrap/button
+//= require bootstrap/carousel
+//= require bootstrap/collapse
+//= require bootstrap/dropdown
+//= require bootstrap/modal
+//= require bootstrap/tooltip
+//= require bootstrap/popover
+//= require bootstrap/scrollspy
+//= require bootstrap/tab
+//= require bootstrap/transition
 //= require_tree .

data/lib/generators/flatuipro/install/templates/flatuipro.js

@@ -5,4 +5,4 @@
 //= require flatui-radio
 //= require jquery.tagsinput
 //= require jquery.placeholder
-//= require jquery.stacktable
+//= require bootstrap-typeahead

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: designmodo-flatuipro-rails
 version: !ruby/object:Gem::Version
-  version: 1.1.4.2
+  version: 1.2.1.0.branch
 platform: ruby
 authors:
 - Samuel Chou
@@ -11,19 +11,19 @@ cert_chain: []
 date: 2013-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: twitter-bootstrap-rails
+  name: bootstrap-on-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 2.2.6
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 2.2.6
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -92,9 +92,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.3