stormpath-rails 0.2.0 → 0.3.0

data/README.md

@@ -12,9 +12,11 @@ edit config/stormpath.yml
 
 export stormpath connection string to STORMPATH_URL (optional)
 
+```ruby
 class User < ActiveRecord:Base
     include Stormpath::Rails::Account
 end
+```
 
 add stormpath_url column to store stormpath UID.
 

data/lib/generators/stormpath/rails/config/config_generator.rb

@@ -3,17 +3,18 @@ module Stormpath
     module Generators
       class ConfigGenerator < ::Rails::Generators::Base
         def create_initializer_file
-          create_file "config/stormpath.yml", "development:
+          create_file "config/stormpath.yml", "common:
   href: <%= ENV['STORMPATH_URL'] %>
-  root: https://api.stormpath.com/v1/directories/<root directory uid>
+  application: https://api.stormpath.com/v1/applications/<application id>
+
+development:
+  root: https://api.stormpath.com/v1/directories/<root directory id>
 
 test:
-  href: <%= ENV['STORMPATH_URL'] %>
-  root: https://api.stormpath.com/v1/directories/<root directory uid>
+  root: https://api.stormpath.com/v1/directories/<root directory id>
 
 production:
-  href: <%= ENV['STORMPATH_URL'] %>
-  root: https://api.stormpath.com/v1/directories/<root directory uid>
+  root: https://api.stormpath.com/v1/directories/<root directory id>
 "
         end
       end

data/lib/stormpath-rails.rb

@@ -1,15 +1,15 @@
-require "stormpath-rails/version"
-require "stormpath-rails/client"
-require "stormpath-rails/account"
+require "stormpath/rails/version"
+require "stormpath/rails/client"
+require "stormpath/rails/account"
 
 module Stormpath
   module Rails
     class Config
-      cattr_accessor :_variables
+      cattr_accessor :vars
 
       def self.[](name)
-        self._variables ||= YAML.load(ERB.new(File.read("#{::Rails.root}/config/stormpath.yml")).result)[::Rails.env]
-        self._variables[name.to_s]
+        self.vars ||= YAML.load(ERB.new(File.read("#{::Rails.root}/config/stormpath.yml")).result)
+        self.vars["common"].update(self.vars[::Rails.env])[name.to_s]
       end
     end
   end

data/lib/{stormpath-rails → stormpath/rails}/account.rb

@@ -21,7 +21,7 @@ module Stormpath
           begin
             account = Client.find_account(user.stormpath_url)
             (STORMPATH_FIELDS - [:password]).each { |field| self.send("#{field}=", account.send("get_#{field}")) }
-          rescue => e
+          rescue ResourceError => error
             #somehow mark as data not loaded
           end
         end

data/lib/{stormpath-rails → stormpath/rails}/client.rb

@@ -5,7 +5,13 @@ include Stormpath::Resource
 module Stormpath
   module Rails
     class Client
-      cattr_accessor :_connection
+      cattr_accessor :connection
+
+      def self.authenticate_account(login, password)
+        #TODO remove app href from config
+        auth_result = self.application.authenticate_account UsernamePasswordRequest.new(login, password)
+        auth_result.get_account
+      end
 
       def self.create_account!(attributes)
         account = self.ds.instantiate ::Account
@@ -36,8 +42,13 @@ module Stormpath
       end
 
       def self.ds
-        self._connection ||= ::ClientApplicationBuilder.new.set_application_href(Config[:href]).build
-        self._connection.client.data_store
+        self.connection ||= ::ClientApplicationBuilder.new.set_application_href(Config[:href]).build
+        self.connection.client.data_store
+      end
+
+      def self.application
+        self.connection ||= ::ClientApplicationBuilder.new.set_application_href(Config[:href]).build
+        self.connection.application
       end
     end
   end

data/lib/{stormpath-rails → stormpath/rails}/version.rb

@@ -1,5 +1,5 @@
 module Stormpath
   module Rails
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

data/stormpath-rails.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'stormpath-rails/version'
+require 'stormpath/rails/version'
 
 Gem::Specification.new do |gem|
   gem.name          = "stormpath-rails"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stormpath-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-18 00:00:00.000000000 Z
+date: 2012-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -57,9 +57,9 @@ files:
 - Rakefile
 - lib/generators/stormpath/rails/config/config_generator.rb
 - lib/stormpath-rails.rb
-- lib/stormpath-rails/account.rb
-- lib/stormpath-rails/client.rb
-- lib/stormpath-rails/version.rb
+- lib/stormpath/rails/account.rb
+- lib/stormpath/rails/client.rb
+- lib/stormpath/rails/version.rb
 - stormpath-rails.gemspec
 homepage: 
 licenses: []