shopify_app 1.0.1 → 2.0.0

data/README.rdoc

@@ -1,8 +1,8 @@
-= Shopify application generator for Rails 3
+= Shopify application generator for Rails 3.1
 
 == Description
 
-This gem makes it easy to get a Rails 3 app up and running with the
+This gem makes it easy to get a Rails 3.1 app up and running with the
 Shopify API.
 
 The generator creates a basic login controller for authenticating with your
@@ -49,10 +49,14 @@ Now visit http://localhost:3000 and install your application in a Shopify store.
 After your application has been given read or read/write API permission by the
 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
+
 == Questions or problems?
 
 http://api.shopify.com <= Read up on the possible API calls!
 
-http://forums.shopify.com/categories/9 <= Talk to new friends!
+https://groups.google.com/forum/#!forum/shopify-api <= Talk to new friends!
 
 http://wiki.shopify.com/Shopify_App_Development <= Edit the docs!

data/lib/generators/shopify_app/shopify_app_generator.rb

@@ -34,13 +34,13 @@ class ShopifyAppGenerator < Rails::Generators::Base
   
   def add_routes
     unless options[:skip_routes]
-      route "match 'login/logout'       => 'login#logout'"
-      route "match 'login/finalize'     => 'login#finalize'"
-      route "match 'login/authenticate' => 'login#authenticate'"
-      route "match 'login'              => 'login#index'"
+      route "root :to                   => 'home#index'"
+      route "match 'login/logout'       => 'login#logout',       :as => :logout"
+      route "match 'login/finalize'     => 'login#finalize',     :as => :finalize"
+      route "match 'login/authenticate' => 'login#authenticate', :as => :authenticate"
+      route "match 'login'              => 'login#index',        :as => :login"
       route "match 'design'             => 'home#design'"
       route "match 'welcome'            => 'home#welcome'"
-      route "root :to                   => 'home#index'"
     end
   end
   

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

@@ -10,7 +10,7 @@ h2 { font-weight: normal; margin-top: 24px; }
 h3 { margin-top: 24px; }
 
 #header {
-  background: #2d3337 url('../images/shopify-logo.png') 20px 50% no-repeat;
+  background: #2d3337 url('../images/logo.png') 20px 50% no-repeat;
   padding: 25px 25px 25px 70px;
   border-top: 5px solid #1f2326;
   border-bottom: 1px solid #252a2e;

data/lib/generators/shopify_app/templates/app/controllers/login_controller.rb

@@ -4,13 +4,13 @@ class LoginController < ApplicationController
     
     # If the #{shop}.myshopify.com address is already provided in the URL, just skip to #authenticate
     if params[:shop].present?
-      redirect_to :controller => 'login', :action => "authenticate", :shop => params[:shop]
+      redirect_to authenticate_path(:shop => params[:shop])
     end
   end
 
   def authenticate
     if params[:shop].present?
-      redirect_to ShopifyAPI::Session.new(params[:shop].to_s).create_permission_url
+      redirect_to ShopifyAPI::Session.new(params[:shop].to_s.strip).create_permission_url
     else
       redirect_to return_address
     end
@@ -47,4 +47,4 @@ class LoginController < ApplicationController
   def return_address
     session[:return_to] || root_url
   end
-end
+end

data/lib/generators/shopify_app/templates/app/helpers/tabs_helper.rb

@@ -1,7 +1,7 @@
 module TabsHelper
   # Create a tab as <li> and give it the id "current" if the current action matches that tab
   def tab(name, url, options = {})
-    if controller.action_name =~ (options[:highlight] = /#{name}/i)
+    if controller.action_name =~ (options[:highlight] = /#{name}/i)  && controller.controller_name == url[:controller]
       content_tag :li, link_to(options[:label] || name.to_s.capitalize, url, {:id => "current"})
     else
       content_tag :li, link_to(options[:label] || name.to_s.capitalize, url)

data/lib/generators/shopify_app/templates/app/views/layouts/application.html.erb

@@ -2,9 +2,9 @@
 <html>
 <head>
   <title>Shopify Application</title>
-  <%= stylesheet_link_tag :all %>
-  <%= javascript_include_tag :defaults %>
-  <%= csrf_meta_tag %>
+  <%= stylesheet_link_tag 'application' %>
+  <%= javascript_include_tag 'application' %>
+  <%= csrf_meta_tags %>
 </head>
 
 <body>
@@ -14,15 +14,15 @@
     <p id="login-link">
       <% if current_shop %>
           <span class="note">current shop</span> <%= link_to current_shop.url, "https://#{current_shop.url}", :class => 'shop_name' %> <span class="note">|</span>
-          <%= link_to 'logout', :controller => "login", :action => 'logout' %>
+          <%= link_to 'logout', logout_path %>
       <% end %>
     </p>
   </div>
 
   <div id="container" class="clearfix">
     <ul id="tabs">
-      <%= tab :index, {:controller => 'home'}, :label => 'Home' %>
-      <%= tab :design, {:controller => 'home', :action => 'design'}, :label => 'Design Help' %>
+      <%= tab :index, {:controller => '/home'}, :label => 'Home' %>
+      <%= tab :design, {:controller => '/home', :action => 'design'}, :label => 'Design Help' %>
     </ul>
     
     <!-- Flash error & notice-->
@@ -36,4 +36,4 @@
     <!-- end div.main -->
   </div>
 </body>
-</html>
+</html>

data/lib/shopify_app/login_protection.rb

@@ -10,7 +10,7 @@ module ShopifyApp::LoginProtection
       end
     else
       session[:return_to] = request.fullpath
-      redirect_to :controller => 'login'
+      redirect_to login_path
     end
   end
   

data/lib/shopify_app/version.rb

@@ -1,3 +1,3 @@
 module ShopifyApp
-  VERSION = "1.0.1"
+  VERSION = "2.0.0"
 end

data/shopify_app.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "shopify-api"
 
-  s.add_runtime_dependency('rails', '~> 3')
+  s.add_runtime_dependency('rails', '~> 3.1')
   s.add_runtime_dependency('shopify_api')
   
   s.add_development_dependency('rake')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: shopify_app
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 15
   prerelease: 
   segments: 
-  - 1
+  - 2
   - 0
-  - 1
-  version: 1.0.1
+  - 0
+  version: 2.0.0
 platform: ruby
 authors: 
 - Shopify
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-12 00:00:00 -05:00
+date: 2011-11-07 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,7 +29,8 @@ dependencies:
         hash: 5
         segments: 
         - 3
-        version: "3"
+        - 1
+        version: "3.1"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -81,6 +82,7 @@ files:
 - lib/generators/shopify_app/README
 - lib/generators/shopify_app/USAGE
 - lib/generators/shopify_app/shopify_app_generator.rb
+- lib/generators/shopify_app/templates/app/assets/stylesheets/shopify_app.css
 - lib/generators/shopify_app/templates/app/controllers/home_controller.rb
 - lib/generators/shopify_app/templates/app/controllers/login_controller.rb
 - lib/generators/shopify_app/templates/app/helpers/home_helper.rb
@@ -94,8 +96,7 @@ files:
 - lib/generators/shopify_app/templates/public/images/box-bg2.gif
 - lib/generators/shopify_app/templates/public/images/info-bg.gif
 - lib/generators/shopify_app/templates/public/images/info.gif
-- lib/generators/shopify_app/templates/public/images/shopify-logo.png
-- lib/generators/shopify_app/templates/public/stylesheets/application.css
+- lib/generators/shopify_app/templates/public/images/logo.png
 - lib/shopify_app.rb
 - lib/shopify_app/configuration.rb
 - lib/shopify_app/login_protection.rb
@@ -132,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: shopify-api
-rubygems_version: 1.4.1
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: This gem is used to get quickly started with the Shopify API