gooddata 0.6.0.pre6 → 0.6.0.pre7

data/lib/gooddata/models/metadata.rb

@@ -28,12 +28,20 @@ module GoodData
         self[:all].find_all {|r| r["tags"].split(",").include?(tag)}
       end
 
-      def find_first_by_title(title)
-        item = self[:all].find {|r| r["title"] == title}
-        self[item["link"]]
+      def get_by_id(id)
+        uri = GoodData::MdObject.id_to_uri(id)
+        self[uri] unless uri.nil?
       end
 
-      private
+      def find_first_by_title(title)
+        all = self[:all]
+        item = if title.is_a?(Regexp)
+          all.find {|r| r["title"] =~ title}
+        else
+          all.find {|r| r["title"] == title}
+        end
+        self[item["link"]] unless item.nil?
+      end
 
       def identifier_to_uri(id)
         raise NoProjectError.new "Connect to a project before searching for an object" unless GoodData.project
@@ -45,6 +53,9 @@ module GoodData
           response['identifiers'][0]['uri']
         end
       end
+
+      alias :id_to_uri :identifier_to_uri
+
     end
 
     def initialize(json)
@@ -52,7 +63,18 @@ module GoodData
     end
 
     def delete
-      GoodData.delete(uri)
+      if saved?
+        GoodData.delete(uri)
+        meta.delete("uri")
+        # ["uri"] = nil
+      end
+    end
+
+    def refresh
+      if saved?
+        @json = GoodData.get(uri)
+      end
+      self
     end
 
     def obj_id
@@ -64,7 +86,7 @@ module GoodData
     end
 
     def uri
-      meta['uri']
+      meta && meta['uri']
     end
 
     def browser_uri
@@ -100,11 +122,11 @@ module GoodData
     end
 
     def meta
-      data['meta']
+      data && data['meta']
     end
 
     def content
-      data['content']
+      data && data['content']
     end
 
     def project
@@ -158,4 +180,4 @@ module GoodData
       true
     end
   end
-end
+end

data/lib/gooddata/models/metric.rb

@@ -74,7 +74,7 @@ module GoodData
 
     def execute
       res = GoodData::ReportDefinition.execute(:left => self)
-      res.to_table[0][0]
+      res[0][0]
     end
 
     def validate

data/lib/gooddata/models/process.rb

@@ -7,68 +7,11 @@ module GoodData
     class << self
       def [](id)
         if id == :all
-          GoodData.get("/gdc/projects/hi95siviyangv53c3vptkz1eas546pnn/dataload/processes")
+          GoodData.get("/gdc/projects/#{GoodData.project.pid}/dataload/processes")
         else 
-          self.new(GoodData.get("/gdc/projects/hi95siviyangv53c3vptkz1eas546pnn/dataload/processes/#{id}"))
+          self.new(GoodData.get("/gdc/projects/#{GoodData.project.pid}/dataload/processes/#{id}"))
         end
       end
-
-      def deploy(dir, options={}, &block) 
-        if block
-          begin
-            res = deploy_graph(dir, options)
-            block.call(res)
-          ensure
-            self_link = res["process"]["links"]["self"]
-            GoodData.delete(self_link)
-          end
-        else
-          deploy_graph(dir, options)
-        end
-      end
-
-      def deploy_graph(dir, options={}) 
-        dir = Pathname(dir)
-        fail "Provided path (#{dir}) is not directory." unless dir.directory?
-        type = options[:type] || "ETL"
-        
-        deploy_name = options[:name] || options[:project_name]
-        verbose = options[:verbose] || false
-        project_pid = 'hi95siviyangv53c3vptkz1eas546pnn'
-        
-        puts HighLine::color("Deploying #{dir}", HighLine::BOLD) if verbose
-        res = nil
-
-        Tempfile.open("deploy-graph-archive") do |temp|
-          Zip::OutputStream.open(temp.path) do |zio|
-            Dir.glob(dir + "**/*") do |item|
-              puts "including #{item}" if verbose
-              unless File.directory?(item)
-                zio.put_next_entry(item)
-                zio.print IO.read(item)
-              end
-            end
-          end
-
-          GoodData.connection.upload(temp.path)
-          process_id = options[:process]
-
-          data = {
-              :process => {
-                :name => deploy_name,
-                :path => "/uploads/#{File.basename(temp.path)}",
-                :type => type
-              }
-            }
-          res = if process_id.nil?
-            GoodData.post("/gdc/projects/#{project_pid}/dataload/processes", data)
-          else
-            GoodData.put("/gdc/projects/#{project_pid}/dataload/processes/#{process_id}", data)
-          end
-        end
-        puts HighLine::color("Deploy DONE #{dir}", HighLine::BOLD) if verbose
-        res
-      end
     end
 
     def initialize(data)

data/lib/gooddata/models/project.rb

@@ -90,7 +90,7 @@ module GoodData
 
     def delete
       raise "Project '#{title}' with id #{uri} is already deleted" if state == :deleted
-      GoodData.delete data['links']['self']
+      GoodData.delete(uri)
     end
 
     def uri

data/lib/gooddata/models/project_metadata.rb

@@ -2,15 +2,24 @@ module GoodData
   class ProjectMetadata
 
     class << self
+
+      def keys
+        ProjectMetadata[:all].keys
+      end
+
       def [](key)
         if key == :all
-          GoodData.get("/gdc/projects/#{GoodData.project.pid}/dataload/metadata")
+          res = GoodData.get("/gdc/projects/#{GoodData.project.pid}/dataload/metadata")
+          res["metadataItems"]["items"].reduce({}) {|memo, i| memo[i["metadataItem"]["key"]] = i["metadataItem"]["value"]; memo}
         else 
           res = GoodData.get("/gdc/projects/#{GoodData.project.pid}/dataload/metadata/#{key}")
           res["metadataItem"]["value"]
         end
       end
 
+      alias_method :get, :[]
+      alias_method :get_key, :[]
+
       def has_key?(key)
         begin
           ProjectMetadata[key]

data/lib/gooddata/models/report.rb

@@ -49,9 +49,6 @@ module GoodData
       @json[:report][:content][:definitions] << a_definition
     end
     
-    def to_json(options={})
-      JSON.pretty_generate(@json, options)
-    end
 # ----
 
 

data/lib/gooddata/models/report_definition.rb

@@ -57,11 +57,41 @@ module GoodData
           if item.respond_to?(:is_attribute?)
             item.display_forms.first
           elsif item.is_a?(String)
-            GoodData::Attribute.find_first_by_title(item).display_forms.first
-          elsif item.is_a?(Hash) && item[:type].to_s == "metric"
-            GoodData::Metric.find_first_by_title(item[:title])
-          elsif item.is_a?(Hash) && item[:type].to_s == "attribute"
-            GoodData::Attribute.find_first_by_title(item[:title]).display_forms.first
+            x = GoodData::MdObject.get_by_id(item)
+            fail "Object given by id \"#{item}\" could not be found" if x.nil?
+            case x.raw_data.keys.first.to_s
+            when "attribute"
+              GoodData::Attribute.new(x.raw_data).display_forms.first
+            when "attributeDisplayForm"
+              GoodData::DisplayForm.new(x.raw_data)
+            when "metric"
+              GoodData::Metric.new(x.raw_data)
+            end
+          elsif item.is_a?(Hash) && item.keys.include?(:title)
+            case item[:type].to_s
+            when "metric"
+              GoodData::Metric.find_first_by_title(item[:title])
+            when "attribute"
+              GoodData::Attribute.find_first_by_title(item[:title]).display_forms.first
+            end
+          elsif item.is_a?(Hash) && (item.keys.include?(:id))
+            case item[:type].to_s
+            when "metric"
+              GoodData::Metric.get_by_id(item[:id])
+            when "attribute"
+              GoodData::Attribute.get_by_id(item[:id]).display_forms.first
+            when "label"
+              GoodData::DisplayForm.get_by_id(item[:id])
+            end
+          elsif item.is_a?(Hash) && (item.keys.include?(:identifier))
+            case item[:type].to_s
+            when "metric"
+              GoodData::Metric.get_by_id(item[:identifier])
+            when "attribute"
+              GoodData::Attribute.get_by_id(item[:identifier]).display_forms.first
+            when "label"
+              GoodData::DisplayForm.get_by_id(item[:identifier])
+            end
           else
             item
           end
@@ -83,8 +113,8 @@ module GoodData
           rd.save
           rd.execute
         ensure
-          rd.delete if rd.saved? rescue nil
-          unsaved_metrics.each {|m| m.delete if m.saved?}
+          rd.delete if rd && rd.saved?
+          unsaved_metrics.each {|m| m.delete if m &&  m.saved?}
         end
       end
 
@@ -126,7 +156,12 @@ module GoodData
     end
 
     def execute
-      result = GoodData.post '/gdc/xtab2/executor3', {"report_req" => {"reportDefinition" => uri}}
+      result = if saved?
+        GoodData.post '/gdc/xtab2/executor3', {"report_req" => {"reportDefinition" => uri}}
+      else
+        # GoodData.post '/gdc/xtab2/executor3', {"report_req" => raw_data}
+        fail("this is currently unsupported. For executing unsaved report definitions please use class method execute.")
+      end
       data_result_uri = result["execResult"]["dataResult"]
       result = GoodData.get data_result_uri
       while result["taskState"] && result["taskState"]["status"] == "WAIT" do

data/lib/gooddata/version.rb

@@ -1,3 +1,3 @@
 module GoodData
-  VERSION = "0.6.0.pre6"
+  VERSION = "0.6.0.pre7"
 end

data/spec/full_project_spec.rb

@@ -0,0 +1,54 @@
+require 'gooddata'
+
+describe "Spin a project", :constraint => 'slow' do
+
+  before(:all) do
+    spec = JSON.parse(File.read("./spec/test_project_model_spec.json"), :symbolize_names => true)
+    GoodData.connect("svarovsky+gem_tester@gooddata.com", "jindrisska")
+    GoodData.logging_on
+
+    @project = GoodData::Model::ProjectCreator.migrate({:spec => spec, :token => "INTNA000000GDPM"})
+  end
+
+  after(:all) do
+    @project.delete unless @project.nil?
+  end
+
+  it "should compute a metric" do
+    GoodData.with_project(@project) do |p|
+      f = GoodData::Fact.find_first_by_title('Lines changed')
+      metric = GoodData::Metric.xcreate("SELECT SUM(#\"#{f.title}\")")
+      metric.execute.should == 9
+    end
+  end
+
+  it "should execute an anonymous metric twice and not fail" do
+    GoodData.with_project(@project) do |p|
+      f = GoodData::Fact.find_first_by_title('Lines changed')
+      metric = GoodData::Metric.xcreate("SELECT SUM(#\"#{f.title}\")")
+      metric.execute.should == 9
+      # Since GD platform cannot execute inline specified metric the metric has to be saved
+      # The code tries to resolve this as transparently as possible
+      metric.execute.should == 9
+    end
+  end
+
+  it "should compute a report" do
+    GoodData.with_project(@project) do |p|
+      f = GoodData::Fact.find_first_by_title('Lines changed')
+      metric = GoodData::Metric.xcreate(:title => "My metric", :expression => "SELECT SUM(#\"#{f.title}\")")
+      metric.save
+
+      result = GoodData::ReportDefinition.execute(:title => "My report", :top => [metric], :left => ['label.devs.email'])
+      result[1][1].should == 3
+      result.include_row?(["jirka@gooddata.com", 5]).should == true
+    end
+  end
+
+  it "should contain metadata for each dataset in project metadata" do
+    GoodData.with_project(@project) do |p|
+      k = GoodData::ProjectMetadata.keys
+      k.should include("manifest_devs")
+    end
+  end
+end

data/spec/goodzilla_spec.rb

@@ -1,4 +1,4 @@
-require 'gooddata/goodzilla/goodzilla'
+require 'gooddata'
 
 describe GoodData::SmallGoodZilla do
   
@@ -54,4 +54,4 @@ describe GoodData::SmallGoodZilla do
     interpolated.should == "SELECT SUM([a]) WHERE [d]=[x] AND [snap]=1"
   end
 
-end
+end

data/spec/model_dsl_spec.rb

@@ -6,7 +6,8 @@ describe GoodData::Model::SchemaBuilder do
   it "should create a schema" do
     builder = GoodData::Model::SchemaBuilder.new("a_title")
     schema = builder.to_schema
-    schema.title.should == "a_title"
+    schema.title.should == "A title"
+    schema.name.should == "a_title"
   end
 
   it "should create a schema with some columns" do

data/spec/test_project_model_spec.json

@@ -0,0 +1,86 @@
+{
+  "title": "Dev Week test",
+  "datasets": [
+    {
+      "name": "repos",
+      "columns": [
+        {
+          "type": "anchor",
+          "name": "id"
+        },
+        {
+          "type": "label",
+          "name": "name",
+          "reference": "id"
+        }
+      ]
+    },
+    {
+      "name": "devs",
+      "columns": [
+        {
+          "type": "anchor",
+          "name": "id"
+        },
+        {
+          "type": "label",
+          "name": "email",
+          "reference": "id"
+        }
+      ]
+    },
+    {
+      "name": "commits",
+      "columns": [
+        {
+          "type": "fact",
+          "name": "lines_changed"
+        },
+        {
+          "type": "date",
+          "name": "committed_on",
+          "dataset": "committed_on"
+        },
+        {
+          "type": "reference",
+          "name": "dev_id",
+          "dataset": "devs",
+          "reference": "id"
+        },
+        {
+          "type": "reference",
+          "name": "repo_id",
+          "dataset": "repos",
+          "reference": "id"
+        }
+      ]
+    }
+  ],
+  "uploads": [
+    {
+      "source": 
+        [["lines_changed","committed_on","dev_id","repo_id"],
+         [1,"01/01/2014",1,1],
+         [3,"01/02/2014",2,2],
+         [5,"05/02/2014",3,1]],
+      "mode": "FULL",
+      "dataset": "commits"
+    },
+    {
+      "source": 
+        [["id", "email"],
+         [1, "tomas@gooddata.com"],
+         [2, "petr@gooddata.com"],
+         [3, "jirka@gooddata.com"]],
+      "mode": "FULL",
+      "dataset": "devs"
+    }
+  ],
+  "date_dimensions": [
+    {
+      "urn": null,
+      "name": "committed_on",
+      "title": null
+    }
+  ]
+}