RubyGems - uzuuzu-core - Versions diffs - 0.0.8 → 0.0.9 - Mend

uzuuzu-core 0.0.8 → 0.0.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (49) hide show

data/VERSION +1 -1
data/lib/uzuuzu/{wrapper/application.rb → application.rb} +2 -1
data/lib/uzuuzu/{wrapper/controller.rb → controller.rb} +1 -15
data/lib/uzuuzu/controller/error.rb +11 -0
data/lib/uzuuzu/controller/view/error/404.rhtml +6 -0
data/lib/uzuuzu/controller/view/error/500.rhtml +6 -0
data/lib/uzuuzu/datastore/activerecord.rb +1 -0
data/lib/uzuuzu/datastore/datamapper.rb +116 -0
data/lib/uzuuzu/datastore/sequel.rb +0 -0
data/lib/uzuuzu/{wrapper/environments.rb → environments.rb} +29 -46
data/lib/uzuuzu/{wrapper → ext}/object.rb +0 -0
data/lib/uzuuzu/fixture/datamapper.rb +114 -0
data/lib/uzuuzu/{wrapper/helper.rb → helper.rb} +1 -0
data/lib/uzuuzu/helper/uzuuzu.rb +48 -0
data/lib/uzuuzu/kvs/appengine.rb +65 -0
data/lib/uzuuzu/kvs/hbase.rb +2 -0
data/lib/uzuuzu/kvs/leveldb.rb +73 -0
data/lib/uzuuzu/kvs/mongo.rb +68 -0
data/lib/uzuuzu/{wrapper/lang → lang}/en.yaml +0 -0
data/lib/uzuuzu/{wrapper/lang → lang}/ja.yaml +0 -0
data/lib/uzuuzu/logger/appengine.rb +51 -0
data/lib/uzuuzu/logger/file.rb +50 -0
data/lib/uzuuzu/logger/loggers.rb +47 -0
data/lib/uzuuzu/logger/stderr.rb +50 -0
data/lib/uzuuzu/logger/stdout.rb +50 -0
data/lib/uzuuzu/mailer/appengine.rb +27 -0
data/lib/uzuuzu/mailer/tmail.rb +44 -0
data/lib/uzuuzu/memcache/appengine.rb +29 -0
data/lib/uzuuzu/memcache/dalli.rb +31 -0
data/lib/uzuuzu/memcache/leveldb.rb +43 -0
data/lib/uzuuzu/memcache/memcached.rb +23 -0
data/lib/uzuuzu/rack_session/appengine.rb +40 -0
data/lib/uzuuzu/rack_session/cookie.rb +25 -0
data/lib/uzuuzu/rack_session/datastore.rb +22 -0
data/lib/uzuuzu/rack_session/memcache.rb +67 -0
data/lib/uzuuzu/{wrapper/request.rb → request.rb} +0 -0
data/lib/uzuuzu/{wrapper/response.rb → response.rb} +0 -1
data/lib/uzuuzu/{wrapper/tilt.rb → tilt.rb} +3 -3
data/lib/uzuuzu/wrapper/logger.rb +23 -103
data/lib/uzuuzu/wrapper/uzuuzu.rb +22 -42
data/lib/uzuuzu/wrapper/wrapper.rb +31 -0
data/lib/uzuuzu_core.rb +19 -0
data/uzuuzu-core.gemspec +41 -17
metadata +42 -18
data/lib/uzuuzu-core.rb +0 -9
data/lib/uzuuzu/uzuuzu-core.rb +0 -17
data/lib/uzuuzu/wrapper/datastore.rb +0 -55
data/lib/uzuuzu/wrapper/mailer.rb +0 -20
data/lib/uzuuzu/wrapper/memcache.rb +0 -20

data/VERSION CHANGED Viewed

	@@ -1 +1 @@
1	- 0.0.8
1	+ 0.0.9

data/lib/uzuuzu/{wrapper/application.rb → application.rb} RENAMED Viewed

@@ -76,7 +76,7 @@ module UzuUzu
     def self.dicons
       @@dicons ||= [
-                    Controller,
+                    Helper::UzuUzuHelper,
                     Helper::Controller,
                     Helper::Renderer,
                     Helper::Localize,
@@ -90,6 +90,7 @@ module UzuUzu
     def self.helpers
       @@helpers ||= [
+                     Helper::UzuUzuHelper,
                      Helper::Controller,
                      Helper::Form,
                      Helper::Jquery,

data/lib/uzuuzu/{wrapper/controller.rb → controller.rb} RENAMED Viewed

@@ -2,30 +2,16 @@
 module UzuUzu
   module Controller
+    autoload(:Error, 'uzuuzu/controller/error')
     def self.current
       Thread.current[:controller]
     end
     def self.before_all
-      ::UzuUzu.datastore
       ::UzuUzu.logger.debug ::UzuUzu::Request.current.params
     end
     def self.after_all
     end
-    #
-    #
-    #
-    def logger
-      UzuUzu.logger
-    end
-    #
-    #
-    #
-    def memcache
-      UzuUzu.memcache
-    end
   end # Controller
 end # UzuUzu

data/lib/uzuuzu/controller/error.rb ADDED Viewed

@@ -0,0 +1,11 @@
+# coding: utf-8
+module UzuUzu
+  module Controller
+    class Error
+      def index(code)
+        respond(render_file(__DIR__("view/error/#{code}.rhtml")))
+      end
+    end
+  end
+end # UzuUzuCms

data/lib/uzuuzu/controller/view/error/404.rhtml ADDED Viewed

@@ -0,0 +1,6 @@
+<html>
+	<body>
+		<%= localize(:not_found) %>
+	</body>
+</html>

data/lib/uzuuzu/controller/view/error/500.rhtml ADDED Viewed

@@ -0,0 +1,6 @@
+<html>
+	<body>
+		<%= localize(:server_error) %>
+	</body>
+</html>

data/lib/uzuuzu/datastore/activerecord.rb ADDED Viewed

	@@ -0,0 +1 @@
1	+ #TODO

data/lib/uzuuzu/datastore/datamapper.rb ADDED Viewed

@@ -0,0 +1,116 @@
+# coding: utf-8
+require 'dm-core'
+module UzuUzu
+  module Datastore
+    class Datamapper
+      #
+      attr_reader :adapter
+      #
+      attr_reader :repository
+      #
+      attr_reader :auto_upgrade
+      #
+      attr_reader :repositories
+      #
+      #
+      #
+      def initialize(env=nil)
+        if env.nil?
+        return
+        end
+        @adapter = :datamapper
+        if env['auto_upgrade'] == 'true' || env['auto_upgrade'] = true
+          @auto_upgrade = true
+        end
+        if env['repository'].nil?
+          @repository = :uzuuzu
+        else
+          @repository = env['repository'].to_sym
+        end
+        @auto_upgrade = false
+        if env['auto_upgrade']
+          @auto_upgrade = true if env['auto_upgrade'] == 'true' || env['auto_upgrade'] == true
+        end
+        unless env['logger'].nil?
+          DataMapper::logger = ::UzuUzu::Wrapper::Logger.new(env['logger']).logger
+        end
+        @repositories = [@repository]
+        repositories_env = {}
+        repos = env['repositories'] || {}
+        if repos.nil?
+          repos = {}
+        end
+        repos.each do |key, value|
+          @repositories.push key.to_sym
+          repositories_env[key.to_sym] = value.clone
+        end
+        if repositories_env[@repository].blank?
+          repositories_env[@repository] = repositories_env[:default]
+        elsif repositories_env[:default].blank?
+          repositories_env[:default] = repositories_env[@repository]
+        end
+        repositories_env.each do |key, value|
+          if value['adapter']
+            DataMapper.setup(key, value)
+            if value['logger']
+              case(value['adapter'])
+              when 'sqlite3'
+                DataObjects::Sqlite3.logger = ::UzuUzu::Wrapper::Logger.new(value['logger']).logger
+              when 'postgres'
+                DataObjects::Postgres.logger = ::UzuUzu::Wrapper::Logger.new(value['logger']).logger
+              when 'mysql'
+                DataObjects::MySql.logger = ::UzuUzu::Wrapper::Logger.new(value['logger']).logger
+              end
+            end
+          end
+        end
+      end # new
+      #
+      #
+      #
+      def repository(repository=nil, &b)
+        repository ||= @repository
+        if b
+          DataMapper.repository(repository, &b)
+        else
+          DataMapper.repository(repository)
+        end
+      end
+      #
+      #
+      #
+      def transaction(repository=nil, *args, &b)
+        tr = DataMapper::Transaction.new(*args)
+        if b
+          DataMapper.repository(repository) do
+            b.call(tr)
+          end
+        end
+        tr
+      end
+      #
+      #
+      #
+      def auto_upgrade?
+        if @auto_upgrade == true
+          return true
+        end
+        false
+      end
+    end # Datamapper
+  end # DataStore
+end # UzuUzu

data/lib/uzuuzu/datastore/sequel.rb ADDED Viewed

File without changes

data/lib/uzuuzu/{wrapper/environments.rb → environments.rb} RENAMED Viewed

@@ -13,13 +13,13 @@ module UzuUzu
     #
     attr_accessor :datastore
     #
-    attr_accessor :memcache
+    attr_accessor :kvs
     #
-    attr_accessor :mailler
+    attr_accessor :memcache
     #
-    attr_accessor :gae
+    attr_accessor :mailer
     #
-    attr_accessor :engine
+    attr_accessor :rack_session
     #
     attr_accessor :config
     #
@@ -52,14 +52,7 @@ module UzuUzu
     def setup(map)
       return if map.blank?
       @config = map
-      if map['gae'].blank?
-      @gae = false
-      else
-        @gae = true
-        require 'uzuuzu/adapter/gae'
-      end
       @lang = map['lang'] || 'ja'
-      @engine = map['engine'] || 'erb'
       load_localize
     end
@@ -79,61 +72,51 @@ module UzuUzu
     def logger
       if @logger.nil?
-        env = @config['logger'] unless @config.nil?
-        @logger = LoggerWrapper.new(env || {})
+        env = @config['logger'].clone unless @config.nil?
+        @logger = Wrapper::Logger.new(env || {}).logger
       end
       @logger
     end
     def datastore
       if @datastore.nil?
-        unless @gae or @config.nil? or @config['datastore'].blank?
-          case(@config['datastore']['adapter'])
-          when 'datamapper'
-            require 'uzuuzu/adapter/datamapper'
-          end
-        end
-        env = @config['datastore'] unless @config.nil?
-        @datastore = DataStoreWrapper.new(env || {})
+        env = @config['datastore'].clone unless @config.nil?
+        @datastore = Wrapper::Wrapper.new('datastore', env || {}).wrapper
       end
       @datastore
     end
+    def kvs
+      if @kvs.nil?
+        env = @config['kvs'].clone unless @config.nil?
+        @kvs = Wrapper::Wrapper.new('kvs', env || {}).wrapper
+      end
+      @kvs
+    end
     def memcache
       if @memcache.nil?
-        unless @gae or @config.nil? or @config['memcache'].blank?
-          case(@config['memcache']['adapter'])
-          when 'memcache-client'
-            require 'uzuuzu/adapter/memcache-client'
-          end
-        end
-        env = @config['memcache'] unless @config.nil?
-        @memcache = MemcacheWrapper.new(env || {})
+        env = @config['memcache'].clone unless @config.nil?
+        @memcache = Wrapper::Wrapper.new('memcache', env || {}).wrapper
+        @memcache ||= {}
       end
       @memcache
     end
     def mailler
       if @mailer.nil?
-        unless @gae or @config.nil? or @config['mailer'].blank?
-          case(@config['mailer']['adapter'])
-          when 'tmail'
-            require 'uzuuzu/adapter/tmail'
-          end
-        end
-        env = @config['mailer'] unless @config.nil?
-        @mailer = MailerWrapper.new(env || {})
+        env = @config['mailer'].clone unless @config.nil?
+        @mailer = Wrapper::Wrapper.new('mailer', env || {}).wrapper
       end
       @mailer
     end # mailler
-    def repository(&b)
-      datastore.uzuuzu_repository(&b)
-    end # repository
-    def transaction(*args, &b)
-      datastore.uzuuzu_transaction(*args, &b)
-    end # transaction
+    def rack_session
+      if @rack_session.nil?
+        env = @config['rack_session'].clone unless @config.nil?
+        @rack_session = Wrapper::Wrapper.new('rack_session', env || {}).wrapper
+      end
+      @rack_session
+    end # rack_session
   end # Environments
 end # UzuUzu

data/lib/uzuuzu/{wrapper → ext}/object.rb RENAMED Viewed

File without changes

data/lib/uzuuzu/fixture/datamapper.rb ADDED Viewed

@@ -0,0 +1,114 @@
+# coding: utf-8
+module UzuUzu
+  module DataStore
+    module Fixture
+      def self.import_file(model, file, overwrite=false)
+        unless ::File.file?(file)
+          raise "UzuUzu fixture import error file not found : #{file}"
+        end
+        ext = ::File.extname(file)
+        case(ext)
+        when '.yml', '.yaml'
+          import_yaml(model, ::YAML.load_file(file), overwrite)
+        when '.xml'
+          # TODO
+        when '.json', '.js'
+          # TODO
+        when '.csv'
+          begin
+            require 'fastercsv'
+            ::FasterCSV.foreach(file) do |row|
+              import_csv(model, row, overwrite)
+            end
+          rescue
+            require "csv"
+            ::CSV.open(file) do |row|
+              import_csv(model, row, overwrite)
+            end
+          end
+        end
+        nil
+      end
+      def self.import_yaml(model, yaml, overwrite=false)
+        ::UzuUzu.logger.debug 'import yaml'
+        ::UzuUzu.transaction do |tr|
+          tr.begin
+          begin
+            if yaml.kind_of?(Array)
+              yaml.each do |map|
+                ::UzuUzu.logger.debug "import #{map.inspect}"
+                resource = model.first(:id => map[:id]) unless map[:id].nil?
+                if resource.nil?
+                  resource = model.new(map)
+                  unless resource.valid?
+                    ::UzuUzu.logger.error resource.errors
+                  end
+                  resource.save
+                elsif overwrite
+                  resource.update(map)
+                  unless resource.valid?
+                    ::UzuUzu.logger.error resource.errors
+                  end
+                end
+              end
+            elsif yaml.kind_of?(Hash)
+              ::UzuUzu.logger.debug "import #{yaml.inspect}"
+              resource = model.first(:id => yaml[:id]) unless yaml[:id].nil?
+              if resource.nil?
+                resource = model.new(yaml)
+                unless resource.valid?
+                  ::UzuUzu.logger.error resource.errors
+                end
+                resource.save
+              elsif overwrite
+                resource.update(yaml)
+                unless resource.valid?
+                  ::UzuUzu.logger.error resource.errors
+                end
+              end
+            else
+              ::UzuUzu.logger.error "import type miss match #{yaml.inspect}"
+            end
+            ::UzuUzu.logger.debug 'imported yaml'
+            tr.commit
+          rescue => e
+            tr.rollback
+            raise e
+          end
+        end # transaction
+      end # import_yaml
+      def self.import_json(model, json, overwrite=false)
+        # TODO
+      end
+      def self.import_xml(model, xml, overwrite=false)
+        # TODO
+      end
+      def self.import_csv(model, csv, overwrite=false)
+        ::UzuUzu.transaction do |tr|
+          tr.begin
+          begin
+            resource = model.first(:id => csv[0])
+            csv.each_with_index do |culumn, index|
+              if resource.nil? || overwrite
+                resource ||= model.new
+                resource.properties.each_with_index do |property, column_no|
+                  resource[property.name] = culumn if index = column_no
+                end
+                resource.save
+              end
+            end
+            tr.commit
+          rescue => e
+            tr.rollback
+            raise e
+          end
+        end
+      end # import_csv
+    end # Fixture
+  end # DataStore
+end # UzuUzu

data/lib/uzuuzu/{wrapper/helper.rb → helper.rb} RENAMED Viewed

@@ -8,6 +8,7 @@ module UzuUzu
     autoload(:Localize, 'uzuuzu/helper/localize')
     autoload(:Renderer, 'uzuuzu/helper/renderer')
     autoload(:Route, 'uzuuzu/helper/route')
+    autoload(:UzuUzuHelper, 'uzuuzu/helper/uzuuzu')
     autoload(:XHtml, 'uzuuzu/helper/xhtml')
     def self.current