medea 0.2.2 → 0.2.3

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/lib/medea/inheritable_attributes.rb

@@ -8,7 +8,10 @@ module ClassLevelInheritableAttributes
   
   module ClassMethods
     def inheritable_attributes(*args)
-      @inheritable_attributes ||= [:inheritable_attributes]
+      #for some reason, in rails, @inheritable_attributes is set to be an empty hash here...
+      #check for this strange case and account for it.
+      @inheritable_attributes = [:inheritable_attributes] if @inheritable_attributes == {} ||
+                                                             @inheritable_attributes == nil
       @inheritable_attributes += args
       args.each do |arg|
         class_eval %(

data/lib/medea/jasondb.rb

@@ -1,17 +1,20 @@
 module JasonDB
     #jason_url here doesn't include the http[s]:// part, but does include the domain and a trailing '/'
     #( so it's "rest.jasondb.com/<domain>/" )
-    attr_accessor :jason_url, :user, :password
-
-
 
     def JasonDB::db_auth_url mode=:secure
-      user = "michael"
-      jason_url = "rest.jasondb.com/medea-test/"
-      password = "password"
+      config = Rails.configuration.database_configuration[Rails.env]
+      user = config["user"]
+      topic = config["topic"]
+      password = config["password"]
+      if config["jason_host"]
+        host = config["jason_host"]
+      else
+        host = "rest.jasondb.com"
+      end
       protocol = "http"
       protocol << "s" if mode == :secure
-      "#{protocol}://#{user}:#{password}@#{jason_url}"
+      "#{protocol}://#{user}:#{password}@#{host}/#{topic}/"
     end
 
-end
+end

data/lib/medea/jasonobject.rb

@@ -19,7 +19,7 @@ module Medea
       list[list_name] = [list_class, list_type]
       self.class_variable_set :@@lists, list
 
-      define_method list_name, do
+      define_method(list_name) do
         #puts "Looking at the #{list_name.to_s} list, which is full of #{list_type.name}s"
         JasonListProperty.new self, list_name, list_class, list_type
       end

data/medea.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{medea}
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Jensen"]
-  s.date = %q{2010-12-21}
+  s.date = %q{2010-12-22}
   s.description = %q{Simple wrapper for persisting objects to JasonDB}
   s.email = %q{michaelj@jasondb.com}
   s.extra_rdoc_files = [
@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
      "lib/medea/jasondeferredquery.rb",
      "lib/medea/jasonlistproperty.rb",
      "lib/medea/jasonobject.rb",
-     "medea-0.2.1.gem",
+     "medea-0.2.2.gem",
      "medea.gemspec"
   ]
   s.homepage = %q{https://github.com/rob-linton/Medea}

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Michael Jensen
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-21 00:00:00 +11:00
+date: 2010-12-22 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -64,7 +64,7 @@ files:
 - lib/medea/jasondeferredquery.rb
 - lib/medea/jasonlistproperty.rb
 - lib/medea/jasonobject.rb
-- medea-0.2.1.gem
+- medea-0.2.2.gem
 - medea.gemspec
 has_rdoc: true
 homepage: https://github.com/rob-linton/Medea