togo 0.6.4 → 0.7.0

data/lib/togo.rb

@@ -8,5 +8,10 @@ module Togo
 
 end
 
+begin
+  require 'extlib'
+rescue
+  require 'active_support'
+end
 require 'togo/model'
 require 'togo/support'

data/lib/togo/admin/admin.rb

@@ -62,12 +62,12 @@ module Togo
     end
 
     get '/edit/:model/:id' do
-      @content = @model.get(params[:id])
+      @content = @model.first(:id => params[:id].to_i)
       erb :edit
     end
 
     post '/update/:model/:id' do
-      @content = @model.stage_content(@model.get(params[:id]),params)
+      @content = @model.stage_content(@model.first(:id => params[:id].to_i),params)
       begin
         raise "Could not save content" if not @content.save
         redirect params[:return_url] || "/#{@model.name}"

data/lib/togo/dispatch/dispatch.rb

@@ -30,7 +30,7 @@ module Togo
       @view_path = opts[:view_path] || 'views'
       @path_prefix = opts[:path_prefix]
       @path_prefix_regexp = Regexp.new("^#{@path_prefix}")
-      ENV['RACK_ENV'] = (opts[:environment] || :development) if not ENV['RACK_ENV']
+      #ENV['RACK_ENV'] = (opts[:environment] || :development) if not ENV['RACK_ENV']
     end
 
     def symbolize_keys(hash)

data/lib/togo/model/model.rb

@@ -50,7 +50,7 @@ module Togo
         end
 
         def update_content!(id,attrs)
-          stage_content(get(id),attrs).save
+          stage_content(first(:id => id),attrs).save
         end
 
         def create_content!(attrs)
@@ -59,8 +59,8 @@ module Togo
 
         def stage_content(content,attrs)
           content.attributes = properties.inject({}){|m,p| attrs[p.name.to_sym] ? m.merge!(p.name.to_sym => attrs[p.name.to_sym]) : m}
-          relationships.each do |r| 
-            val = attrs["related_#{r[0]}".to_sym]
+          relationships.each do |r|
+            val = attrs["related_#{r.name}".to_sym]
             next if not val or val == 'unset'
             content = RelationshipManager.create(content, r, :ids => val).relate
           end
@@ -126,7 +126,7 @@ module Togo
             when ::DataMapper::Associations::OneToMany::Relationship
               'has_n'
             when ::DataMapper::Property
-              class_variable_get(:@@inflector).demodulize(property.type || property.class).downcase # type seems to be deprecated in 1.0
+              class_variable_get(:@@inflector).demodulize(property.class).downcase # type seems to be deprecated in 1.0
             else
               'string'
           end
@@ -163,18 +163,18 @@ module Togo
         end
 
         def shown_properties
-          skip = relationships.values.collect{|r| r.through if r.respond_to?(:through) }.compact.uniq # don't include join models
-          properties.select{|p| not BLACKLIST.include?(p.name) and not p.name =~ /_id$/} + relationships.values.select{|r| not skip.include?(r)}
+          skip = relationships.to_a.collect{|r| r.through if r.respond_to?(:through) }.compact.uniq # don't include join models
+          properties.select{|p| not BLACKLIST.include?(p.name) and not p.name =~ /_id$/} + relationships.to_a.select{|r| not skip.include?(r)}
         end
 
         def search_properties
           # Support dm 0.10.x and 1.x by checking for deprecated(?) types
-          only_properties = [String, ::DataMapper::Types::Text]
+          only_properties = [String]
           begin # rescue exception when not using dm-core 1.0, these don't exist in the 0.10.x series
             only_properties.concat([::DataMapper::Property::String, ::DataMapper::Property::Text])
           rescue
           end
-          properties.select{|p| only_properties.include?(p.type || p.class)} # type seems to be depracated in 1.0
+          properties.select{|p| only_properties.include?(p.class)} # type seems to be depracated in 1.0
         end
 
       end

data/lib/togo/model/relationship_manager/relationship_manager.rb

@@ -3,7 +3,7 @@ module Togo
     class RelationshipManager
 
       def self.create(content, relationship, opts = {})
-        case relationship[1]
+        case relationship
         when ::DataMapper::Associations::ManyToOne::Relationship
           ManyToOne.new(content, relationship, opts)
         when ::DataMapper::Associations::OneToMany::Relationship
@@ -13,8 +13,8 @@ module Togo
 
       def initialize(content, relationship, opts = {})
         @content = content
-        @relationship = relationship[1]
-        @relationship_name = relationship[0]
+        @relationship = relationship
+        @relationship_name = relationship.name
         @ids = (opts[:ids] || '').split(',').map(&:to_i)
       end
 

metadata

@@ -1,48 +1,36 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: togo
-version: !ruby/object:Gem::Version 
-  hash: 15
-  prerelease: false
-  segments: 
-  - 0
-  - 6
-  - 4
-  version: 0.6.4
+version: !ruby/object:Gem::Version
+  version: 0.7.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Matt King
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-11-21 00:00:00 -08:00
+date: 2011-06-30 00:00:00.000000000 -07:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: erubis
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2165171020 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 0
-        - 0
-        - 0
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
         version: 0.0.0
   type: :runtime
-  version_requirements: *id001
-description: With a few lines of code in your Ruby ORMs, you get a highly configurable and extensive content management tool (CMS).
+  prerelease: false
+  version_requirements: *2165171020
+description: With a few lines of code in your Ruby ORMs, you get a highly configurable
+  and extensive content management tool (CMS).
 email: matt@mking.me
-executables: 
+executables:
 - togo-admin
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - README.md
 - Changelog
 - LICENSE
@@ -99,39 +87,29 @@ files:
 has_rdoc: true
 homepage: http://github.com/mattking17/Togo/
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
 - lib/togo/model
 - lib/togo/dispatch
 - lib/togo/admin
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      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 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: CMS Framework for Ruby ORMs
 test_files: []
-