mirah_model 0.0.1-java → 0.0.2-java

data/README.md

@@ -29,6 +29,7 @@ or by using the update method and passing a hash
 
 Development
 ------------
+Requires Mirah 0.0.6(unreleased) to compile
 
 You can build the jar by running:
 

data/Rakefile

@@ -1,30 +1,31 @@
 require 'rubygems'
 require 'rubygems/package_task'
 require 'ant'
+
 require 'appengine-sdk'
 require 'mirah_task'
 
-
 Gem::PackageTask.new Gem::Specification.load('mirah_model.gemspec') do |pkg|
   pkg.need_zip = true
   pkg.need_tar = true
 end
 
-task :gem => :jar
 #require 'maven/junit/junit'
 # -- will work after maven support --JUNIT_JAR = Gem.find_files('maven/junit/junit.jar').first
-JUNIT_JAR = 'javalib/junit.jar'
-TESTING_JARS = [AppEngine::SDK::API_JAR, AppEngine::SDK::LABS_JAR, JUNIT_JAR
-] +
-  AppEngine::SDK::RUNTIME_JARS.reject {|j| j =~ /appengine-local-runtime/}
+
+TESTING_JARS = [AppEngine::SDK::API_JAR,
+                AppEngine::SDK::LABS_JAR,
+                'javalib/junit.jar',
+                *AppEngine::SDK::RUNTIME_JARS.reject {|j| j =~ /appengine-local-runtime/}
+              ]
+              
 TESTING_JARS.each {|jar| $CLASSPATH << jar}
 
-# Mirah.compiler_options = ['-V']
+#Mirah.compiler_options = ['-V']
 
 task :default => :test
 
-task :init do
-  mkdir_p 'dist'
+task :init do  
   mkdir_p 'build'
 end
 
@@ -34,22 +35,28 @@ task :clean do
 end
 
 task :compile => :init do
-  # build the Duby sources
-  puts "Compiling Duby sources"
-  mirahc '.', :dir => 'src', :dest => 'build'
+  # build the Mirah sources
+  puts "Compiling Mirah sources"
+  args = Dir['src/**/*.{mirah,duby}'] + [{ :dir => 'src', :dest => 'build'}]
+  mirahc *args
 end
 
 desc "run tests"
 task :compile_test => :jar do
-  puts "Compiling Duby tests"
-  mirahc '.', :dir => 'test', :dest => 'test',
-         :options => ['--classpath', Dir.pwd + "/dist/dubydatastore.jar"]
+  puts "Compiling Mirah tests"
+  args = Dir['test/**/*.{mirah,duby}'] + [{ :dir => 'test', :dest => 'test',
+         :options => ['--classpath', Dir.pwd + "/lib/mirahdatastore.jar"]}]
+  mirahc *args  
 end
 
+file 'lib/mirahdatastore.jar' => :jar
+
 desc "build jar"
 task :jar => :compile do
-  ant.jar :jarfile => 'dist/dubydatastore.jar' do
-    fileset :dir => 'lib'
+  ant.jar :jarfile => 'lib/mirahdatastore.jar' do
+    fileset :dir => 'lib' do
+      exclude :name => '*.jar'
+    end
     fileset :dir => 'build'
   end
 end
@@ -64,4 +71,4 @@ task :test => :compile_test do
       formatter :type => 'plain', :usefile => 'false'
     end
   end
-end
+end

data/lib/mirah_model.rb

@@ -0,0 +1,4 @@
+require File.dirname(__FILE__)+'/mirahdatastore.jar'
+
+module MirahModel
+end

data/lib/mirah_model/datastore.rb

@@ -1,5 +1,5 @@
 module AppEngine
-  class DubyDatastorePlugin
+  class MirahDatastorePlugin
     @models = {}
 
     TypeMap = {
@@ -51,7 +51,7 @@ module AppEngine
     }
 
     class ModelState
-      include Duby::AST
+      include Mirah::AST
       attr_reader :kind, :query, :read, :save, :transformer
 
       def initialize(transformer, klass, parent, position, ast)
@@ -109,7 +109,7 @@ module AppEngine
               self
             end
           EOF
-          [Duby::AST.type(nil, 'com.google.appengine.ext.duby.db.DQuery'),
+          [Mirah::AST.type(nil, 'com.google.appengine.ext.mirah.db.DQuery'),
            eval(classdef, queryinit)]
         end
         ast << @query
@@ -131,7 +131,7 @@ module AppEngine
           end
         EOF
         @get_properties = get_properties.body.children[1] =
-            Duby::AST::Body.new(get_properties.body, position)
+            Mirah::AST::Body.new(get_properties.body, position)
         ast << get_properties
         update = eval(parent, <<-EOF)
           def update(properties:Map)
@@ -260,7 +260,7 @@ module AppEngine
     end
 
     def self.find_class(node)
-      node = node.parent until Duby::AST::ClassDefinition === node
+      node = node.parent until Mirah::AST::ClassDefinition === node
       node
     end
 
@@ -275,9 +275,9 @@ module AppEngine
     end
 
     def self.from_datastore(type, value)
-      duby_type = TypeMap[type]
-      if duby_type
-        default = Defaults.fetch(type, "#{duby_type}(nil)")
+      mirah_type = TypeMap[type]
+      if mirah_type
+        default = Defaults.fetch(type, "#{mirah_type}(nil)")
         conversion = Conversions[type]
         "(#{value} ? #{type}(#{value}).#{conversion} : #{default})"
       else
@@ -296,7 +296,7 @@ module AppEngine
       type = type.name
       type = 'Long' if type == 'Integer'
 
-      result = Duby::AST::ScopedBody.new(parent, fcall.position) {[]}
+      result = Mirah::AST::ScopedBody.new(parent, fcall.position) {[]}
       result.static_scope = fcall.scope.static_scope
       klass = find_class(parent)
       unless @models[klass]
@@ -305,10 +305,10 @@ module AppEngine
       end
       model = @models[klass]
 
-      duby_type = TypeMap.fetch(type, type)
-      coercion = "coerce_" + duby_type.downcase.sub("[]", "s")
+      mirah_type = TypeMap.fetch(type, type)
+      coercion = "coerce_" + mirah_type.downcase.sub("[]", "s")
 
-      if duby_type == 'List'
+      if mirah_type == 'List'
         model.extend_query(<<-EOF)
           def #{name}(value:Object)
             returns :void
@@ -317,7 +317,7 @@ module AppEngine
         EOF
       else
         model.extend_query(<<-EOF)
-          def #{name}(value:#{duby_type})
+          def #{name}(value:#{mirah_type})
             returns :void
             _query.addFilter("#{name}", _eq_op, #{to_datastore(type, 'value')})
           end
@@ -339,7 +339,7 @@ module AppEngine
       EOF
 
       model.extend_get_properties(<<-EOF)
-        result.put("#{name}", #{maybe_box(duby_type, 'self.' + name)})
+        result.put("#{name}", #{maybe_box(mirah_type, 'self.' + name)})
       EOF
 
       result << model.eval(parent, <<-EOF)
@@ -347,7 +347,7 @@ module AppEngine
           @#{name}
         end
 
-        def #{name}=(value:#{duby_type})
+        def #{name}=(value:#{mirah_type})
           @#{name} = value
         end
 
@@ -359,9 +359,9 @@ module AppEngine
       result
     end
 
-    def self.maybe_box(duby_type, value)
-      if Boxes.include?(duby_type)
-        "#{Boxes[duby_type]}.valueOf(#{value})"
+    def self.maybe_box(mirah_type, value)
+      if Boxes.include?(mirah_type)
+        "#{Boxes[mirah_type]}.valueOf(#{value})"
       else
         value
       end
@@ -371,5 +371,5 @@ module AppEngine
       @models = {}
     end
   end
-  ::Duby.plugins << DubyDatastorePlugin
+  ::Mirah.plugins << MirahDatastorePlugin
 end

data/test/model_test.mirah

@@ -1,4 +1,4 @@
-package com.google.appengine.ext.duby.db
+package com.google.appengine.ext.mirah.db
 
 import com.google.appengine.tools.development.testing.LocalDatastoreServiceTestConfig
 import com.google.appengine.tools.development.testing.LocalServiceTestConfig
@@ -112,4 +112,4 @@ class ModelTest
     assertEquals(e.key, e2.key)
   end
   # TODO more tests.
-end
+end

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: mirah_model
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-    - 0
-    - 0
-    - 1
-  version: 0.0.1
+  prerelease: 
+  version: 0.0.2
 platform: java
 authors: 
   - Ryan Brown
@@ -14,34 +10,28 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-15 08:47:11.863000 -07:00
+date: 2011-02-15 18:45:32.018000 -07:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: mirah
     prerelease: false
     requirement: &id001 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
-        - - ">="
+        - - "="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 0
-              - 0
-              - 4
-            version: 0.0.4
+            version: 0.0.5
     type: :runtime
     version_requirements: *id001
   - !ruby/object:Gem::Dependency 
     name: appengine-sdk
     prerelease: false
     requirement: &id002 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
-            segments: 
-              - 1
-              - 4
-              - 0
             version: 1.4.0
     type: :runtime
     version_requirements: *id002
@@ -55,11 +45,13 @@ extensions: []
 extra_rdoc_files: 
   - README.md
 files: 
+  - lib/mirah_model.rb
+  - lib/mirahdatastore.jar
   - lib/mirah_model/datastore.rb
   - test/model_test.mirah
-  - test/com/google/appengine/ext/duby/db/ModelTest.class
-  - test/com/google/appengine/ext/duby/db/TestModel$Query.class
-  - test/com/google/appengine/ext/duby/db/TestModel.class
+  - test/com/google/appengine/ext/mirah/db/ModelTest.class
+  - test/com/google/appengine/ext/mirah/db/TestModel$Query.class
+  - test/com/google/appengine/ext/mirah/db/TestModel.class
   - README.md
   - Rakefile
 has_rdoc: true
@@ -73,23 +65,21 @@ rdoc_options:
 require_paths: 
   - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-          - 0
         version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-          - 0
         version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Mirah Model is a ORM library for App Engine's datastore.