sharkapps 0.1.13 → 0.1.14

data/Gemfile

@@ -12,3 +12,5 @@ group :development do
   gem "jeweler", "~> 1.5.2"
   gem "rcov", ">= 0"
 end
+
+  gem 'rabl'

data/Gemfile.lock

@@ -44,7 +44,11 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.16)
+    multi_json (1.3.2)
     polyglot (0.3.2)
+    rabl (0.6.9)
+      activesupport (>= 2.3.14)
+      multi_json (~> 1.0)
     rack (1.2.3)
     rack-mount (0.6.14)
       rack (>= 1.0.0)
@@ -76,10 +80,12 @@ GEM
 
 PLATFORMS
   ruby
+  x86-mingw32
 
 DEPENDENCIES
   bundler (~> 1.0.0)
   jeweler (~> 1.5.2)
+  rabl
   rails (>= 3.0.9)
   rcov
   shoulda

data/VERSION

@@ -1 +1 @@
-0.1.13
+0.1.14

data/app/controllers/api/accounts_controller.rb

@@ -0,0 +1,54 @@
+class Api::AccountsController < ApplicationController
+  skip_before_filter :ensure_canvas_connected_to_facebook
+  before_filter :authorize_access
+  before_filter :find_account, :only => [:show]
+  
+  # GET /accounts/1
+  # GET /accounts/1.xml
+  def show
+    respond_to do |wants|
+      wants.html # show.html.erb
+      wants.json {}
+      wants.xml  { render :xml => @account }
+    end
+  end
+  
+  # POST /accounts
+  # POST /accounts.xml
+  def create
+    @account = Account.find_or_create_by_fbid(params[:id])
+
+    respond_to do |format|
+      if @account.save
+        format.html { }
+        format.xml  { }
+        format.json  { render :action => "show.rabl"}
+      end
+    end
+  end
+  
+  def unauthorized
+    @error = "Token is not correct"
+    
+    respond_to do |format|
+        format.html { }
+        format.xml  { }
+        format.json  { }
+    end
+  end
+  
+  private
+    
+    def authorize_access
+      token = "fioerAppforBlat"
+      if token != params[:token]
+        puts "TOKEN is INVALID!!"
+        render :action => "unauthorized.rabl"
+      end
+    end
+  
+    def find_account
+      @account = Account.find(params[:id])
+    end
+  
+end

data/app/views/api/accounts/show.rabl

@@ -0,0 +1,3 @@
+object @account
+
+attributes :fbid, :acc_hash

data/app/views/api/accounts/unauthorized.rabl

@@ -0,0 +1,2 @@
+object @error
+

data/app/views/appforma/_footer.html.erb

@@ -7,7 +7,7 @@
           <%= link_to image_tag("https://s3.amazonaws.com/appforma_static/logos/logo_solo.png", :border => 0), "http://www.appforma.com", {:target => "_blank"}%>
         </div>
         <div id="logo_dot_link">
-          <%= link_to t('general.logo_link'), "http://www.appforma.com/pricing?ref=#{@account.fbid}", {:target => "_blank"}%>
+          <%= link_to t('general.logo_link'), "http://www.appforma.com/products", {:target => "_blank"}%>
         </div>
       </div>
     <% when Account::LOGO_DUAL %>

data/config/routes.rb

@@ -3,4 +3,9 @@ Rails.application.routes.draw do
   match 'locale_selector' => 'appforma#locale_selector', :as => :locale_selector
   match 'not_subscribed' => 'appforma#not_subscribed', :as => :not_subscribed
   match 'not_authorized' => 'appforma#not_authorized', :as => :not_authorized
+  
+  #API routes
+  scope "/api/v1" do
+    resources :accounts, :only => [:show, :create, :unauthorized], :controller => "api/accounts"
+  end
 end

data/lib/sharkapps/account.rb

@@ -16,6 +16,7 @@ class AppformaAccount < ActiveResource::Base
       cur_account.trial_remaining = acc.trial_remaining
     end
     cur_account.last_approval_check = Time.now
+    cur_account.footer_state = acc.branding
     cur_account.save(false)
     cur_account
   end

data/sharkapps.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sharkapps}
-  s.version = "0.1.13"
+  s.version = "0.1.14"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Eyal Kedem"]
-  s.date = %q{2012-02-08}
+  s.date = %q{2012-04-29}
   s.description = %q{integration utilities with the shark apps framework}
   s.email = %q{ekedem@gmail.com}
   s.extra_rdoc_files = [
@@ -24,7 +24,10 @@ Gem::Specification.new do |s|
     "README.rdoc",
     "Rakefile",
     "VERSION",
+    "app/controllers/api/accounts_controller.rb",
     "app/controllers/appforma_controller.rb",
+    "app/views/api/accounts/show.rabl",
+    "app/views/api/accounts/unauthorized.rabl",
     "app/views/appforma/_footer.html.erb",
     "app/views/appforma/_header.html.erb",
     "app/views/appforma/_notifications.html.erb",
@@ -62,12 +65,14 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<rabl>, [">= 0"])
       s.add_development_dependency(%q<rails>, [">= 3.0.9"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
     else
+      s.add_dependency(%q<rabl>, [">= 0"])
       s.add_dependency(%q<rails>, [">= 3.0.9"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
@@ -75,6 +80,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
+    s.add_dependency(%q<rabl>, [">= 0"])
     s.add_dependency(%q<rails>, [">= 3.0.9"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: sharkapps
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 7
   prerelease: false
   segments: 
   - 0
   - 1
-  - 13
+  - 14
   segments_generated: true
-  version: 0.1.13
+  version: 0.1.14
 platform: ruby
 authors: 
 - Eyal Kedem
@@ -16,12 +16,27 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-08 00:00:00 +02:00
+date: 2012-04-29 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rails
+  name: rabl
   version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        segments_generated: true
+        version: "0"
+  requirement: *id001
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  name: rails
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -33,12 +48,12 @@ dependencies:
         - 9
         segments_generated: true
         version: 3.0.9
-  requirement: *id001
+  requirement: *id002
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
   name: shoulda
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -48,12 +63,12 @@ dependencies:
         - 0
         segments_generated: true
         version: "0"
-  requirement: *id002
+  requirement: *id003
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
   name: bundler
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -65,12 +80,12 @@ dependencies:
         - 0
         segments_generated: true
         version: 1.0.0
-  requirement: *id003
+  requirement: *id004
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -82,12 +97,12 @@ dependencies:
         - 2
         segments_generated: true
         version: 1.5.2
-  requirement: *id004
+  requirement: *id005
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
   name: rcov
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -97,7 +112,7 @@ dependencies:
         - 0
         segments_generated: true
         version: "0"
-  requirement: *id005
+  requirement: *id006
   prerelease: false
   type: :development
 description: integration utilities with the shark apps framework
@@ -117,7 +132,10 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- app/controllers/api/accounts_controller.rb
 - app/controllers/appforma_controller.rb
+- app/views/api/accounts/show.rabl
+- app/views/api/accounts/unauthorized.rabl
 - app/views/appforma/_footer.html.erb
 - app/views/appforma/_header.html.erb
 - app/views/appforma/_notifications.html.erb