shopify_app 2.1.0 → 2.1.1

data/README.rdoc

@@ -1,8 +1,8 @@
-= Shopify application generator for Rails 3.1
+= Shopify application generator for Rails 3.2
 
 == Description
 
-This gem makes it easy to get a Rails 3.1 app up and running with the
+This gem makes it easy to get a Rails 3.2 app up and running with the
 Shopify API.
 
 The generator creates a basic login controller for authenticating with your
@@ -51,7 +51,7 @@ shop, you're ready to start experimenting with the Shopify API.
 
 == Rails 3.0 Support
 
-Rails 3.0 is supported on a branch of our github repo: https://github.com/Shopify/shopify_app/tree/rails_3.0_support
+Rails 3.0 (as in before the big changes in 3.1) is supported on a branch of our github repo: https://github.com/Shopify/shopify_app/tree/rails_3.0_support
 
 == Questions or problems?
 

data/lib/generators/shopify_app/templates/app/assets/stylesheets/{shopify_app.scss → shopify_app.css.scss}

@@ -35,7 +35,7 @@ a { color:$col-blue;
 
 .dropdown-menu li > a:hover, .dropdown-menu .active > a, .dropdown-menu .active > a:hover {
   background-color:$col-blue !important;
-  [class^="icon-"] { background-image: url('../assets/glyphicons-halflings-white.png');}
+  [class^="icon-"] { background-image: url('/assets/twitter/bootstrap/glyphicons-halflings-white.png');}
 }
 
 .container {
@@ -47,9 +47,9 @@ a { color:$col-blue;
 
 .content { min-height: 500px;}
 
-[class^="icon-"] { background-image: url('../assets/glyphicons-halflings.png');}
+[class^="icon-"] { background-image: url('/assets/twitter/bootstrap/glyphicons-halflings.png');}
 
-.icon-white { background-image: url('../assets/glyphicons-halflings-white.png');}
+.icon-white { background-image: url('/assets/twitter/bootstrap/glyphicons-halflings-white.png');}
 
 .navbar {
   .brand { color: #fff;}
@@ -135,7 +135,7 @@ h1,h2 { letter-spacing:-1px;}
 .jumbotron { background: #222; margin:-20px -20px 20px -20px; position: relative;}
 .jumbotron h1 { font-size: 54px; line-height: 1; text-shadow: 0 1px 2px rgba(0, 0, 0, .5);}
 .jumbotron h1, .jumbotron p { margin-right:0; margin-bottom: 9px; color: #fff; text-align: center; text-shadow: 0 1px 1px rgba(0, 0, 0, .3);}
-.jumbotron .inner { background: transparent url('../assets/grid-18px.png') top center; padding: 45px 0; 
+.jumbotron .inner { background: transparent url('/assets/grid-18px.png') top center; padding: 45px 0; 
   -webkit-box-shadow: inset 0 -20px 300px rgba(0,0,0,.4); -moz-box-shadow: inset 0 -20px 300px rgba(0,0,0,.4);}
 
 @media (max-width: 480px) {

data/lib/generators/shopify_app/templates/app/assets/stylesheets/shopify_app_buttons.css.less

@@ -57,7 +57,7 @@
 // Set the backgrounds
 // -------------------------
 .btn-primary {
-  .buttonBackground(@primaryButtonBackground, spin(@primaryButtonBackground, 20));
+  .buttonBackground(@shopifyBtnBackground, spin(@shopifyBtnBackground, 20));
 }
 // Warning appears are orange
 .btn-warning {

data/lib/shopify_app/version.rb

@@ -1,3 +1,3 @@
 module ShopifyApp
-  VERSION = "2.1.0"
+  VERSION = "2.1.1"
 end

metadata

@@ -1,61 +1,73 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: shopify_app
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 2.1.1
   prerelease: 
-  version: 2.1.0
 platform: ruby
-authors: 
+authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-02-22 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-03-28 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rails
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "3.1"
+      - !ruby/object:Gem::Version
+        version: '3.1'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: shopify_api
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: shopify_api
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-description: Creates a basic login controller for authenticating with your Shop and also a product controller which lets your edit your products easily.
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Creates a basic login controller for authenticating with your Shop and
+  also a product controller which lets your edit your products easily.
+email:
 - edward@shopify.com
 - willem@shopify.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - CHANGELOG
 - Gemfile
@@ -74,7 +86,7 @@ files:
 - lib/generators/shopify_app/templates/app/assets/javascripts/application.js
 - lib/generators/shopify_app/templates/app/assets/stylesheets/application.css
 - lib/generators/shopify_app/templates/app/assets/stylesheets/imports.css.less
-- lib/generators/shopify_app/templates/app/assets/stylesheets/shopify_app.scss
+- lib/generators/shopify_app/templates/app/assets/stylesheets/shopify_app.css.scss
 - lib/generators/shopify_app/templates/app/assets/stylesheets/shopify_app_buttons.css.less
 - lib/generators/shopify_app/templates/app/controllers/home_controller.rb
 - lib/generators/shopify_app/templates/app/controllers/login_controller.rb
@@ -101,30 +113,26 @@ files:
 - shopify_app.gemspec
 homepage: http://www.shopify.com/developers
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: shopify-api
-rubygems_version: 1.8.16
+rubygems_version: 1.8.19
 signing_key: 
 specification_version: 3
 summary: This gem is used to get quickly started with the Shopify API
 test_files: []
-